aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-07-03 11:49:46 +0200
committerChristian Schneppe <christian@pix-art.de>2019-07-03 11:49:46 +0200
commit00334edc6f53cf49298f23b4db87e843d1f56542 (patch)
tree2286a4a3456b973d9c82d0d49c76bd4a8b87d25e
parent7d55a62328bce9edb9aca9d7b19bbcd24dc22b22 (diff)
disable muc push on archive instead of leave
leave can be triggered in conference details and doesn’t mean we don’t want pushes
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 410058d58..cb18a1d7e 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2311,6 +2311,10 @@ public class XmppConnectionService extends Service {
pushBookmarks(bookmark.getAccount());
}
}
+ if (conversation.getMucOptions().push()) {
+ disableDirectMucPush(conversation);
+ mPushManagementService.disablePushOnServer(conversation);
+ }
leaveMuc(conversation);
} else {
conversation.endOtrIfNeeded();
@@ -3132,10 +3136,6 @@ public class XmppConnectionService extends Service {
account.pendingConferenceLeaves.remove(conversation);
}
if (account.getStatus() == Account.State.ONLINE || now) {
- if (conversation.getMucOptions().push()) {
- disableDirectMucPush(conversation);
- mPushManagementService.disablePushOnServer(conversation);
- }
sendPresencePacket(conversation.getAccount(), mPresenceGenerator.leave(conversation.getMucOptions()));
conversation.getMucOptions().setOffline();
Bookmark bookmark = conversation.getBookmark();