gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-01 20:22:03 +00:00
Code Issues Packages Projects Releases 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); NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
if (wasDetached & conversationUser.hasSpreedCapabilityWithName("no-ping")) { if (wasDetached & conversationUser.hasSpreedCapabilityWithName("no-ping")) {
wasDetached = false;
joinRoomWithPassword(); joinRoomWithPassword();
} }
} }
@ -517,6 +518,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
super.onDetach(view); super.onDetach(view);
if (conversationUser.hasSpreedCapabilityWithName("no-ping")) { if (conversationUser.hasSpreedCapabilityWithName("no-ping")) {
wasDetached = true; wasDetached = true;
leaveRoom();
} }
} }
@ -588,8 +590,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void joinRoomWithPassword() { private void joinRoomWithPassword() {
wasDetached = false;
if (currentCall == null) { if (currentCall == null) {
ncApi.joinRoom(credentials, ApiUtils.getUrlForSettingMyselfAsActiveParticipant(baseUrl, roomToken), roomPassword) ncApi.joinRoom(credentials, ApiUtils.getUrlForSettingMyselfAsActiveParticipant(baseUrl, roomToken), roomPassword)
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
@ -653,7 +653,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
dispose(); dispose();
if (!isDestroyed() && !isBeingDestroyed()) { if (!isDestroyed() && !isBeingDestroyed() && !wasDetached) {
getRouter().popCurrentController(); getRouter().popCurrentController();
} }
} }