mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 13:35:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Always leave room

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-17 21:13:44 +01:00
parent da779190ed
commit 192c435b2b
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View file

@ -173,7 +173,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
private static final byte CONTENT_TYPE_SYSTEM_MESSAGE = 1;
private boolean wasDetached;
private boolean isStartingACall;
public ChatController(Bundle args) {
super(args);
@ -512,8 +511,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
joinRoomWithPassword();
}
}
isStartingACall = false;
}
@Override
@ -522,9 +519,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (conversationUser.hasSpreedCapabilityWithName("no-ping")
&& getActivity() != null && !getActivity().isChangingConfigurations()) {
wasDetached = true;
if (!isStartingACall) {
leaveRoom();
}
leaveRoom();
}
}
@ -658,6 +653,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override
public void onNext(GenericOverall genericOverall) {
dispose();
currentCall = null;
if (!isDestroyed() && !isBeingDestroyed() && !wasDetached) {
getRouter().popCurrentController();
}
@ -1020,13 +1016,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (!isVoiceOnlyCall) {
Intent videoCallIntent = getIntentForCall(false);
if (videoCallIntent != null) {
isStartingACall = true;
startActivity(videoCallIntent);
}
} else {
Intent voiceCallIntent = getIntentForCall(true);
if (voiceCallIntent != null) {
isStartingACall = true;
startActivity(voiceCallIntent);
}
}