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

Fix push

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-11 13:14:57 +01:00
parent ccb6c6efa1
commit 88298026aa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -507,6 +507,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
if (wasDetached & conversationUser.hasSpreedCapabilityWithName("no-ping")) {
wasDetached = false;
joinRoomWithPassword();
}
}
@ -517,6 +518,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
super.onDetach(view);
if (conversationUser.hasSpreedCapabilityWithName("no-ping")) {
wasDetached = true;
leaveRoom();
}
}
@ -588,8 +590,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void joinRoomWithPassword() {
wasDetached = false;
if (currentCall == null) {
ncApi.joinRoom(credentials, ApiUtils.getUrlForSettingMyselfAsActiveParticipant(baseUrl, roomToken), roomPassword)
.subscribeOn(Schedulers.newThread())
@ -653,7 +653,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override
public void onNext(GenericOverall genericOverall) {
dispose();
if (!isDestroyed() && !isBeingDestroyed()) {
if (!isDestroyed() && !isBeingDestroyed() && !wasDetached) {
getRouter().popCurrentController();
}
}