aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-09-19 19:18:30 +0200
committerChristian Schneppe <christian@pix-art.de>2017-09-19 19:18:30 +0200
commiteb56936af7f10ceedfedc1df86b52837c2dfc596 (patch)
treea9e828e2f2d83742f6762ea865692397c89b8115 /src/main/java/de/pixart
parentc0c9ce588ec60f09d0199c53a1229b722e9fa910 (diff)
Don't leave conferences before join
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 0900a4ec4..dda022caf 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2335,7 +2335,10 @@ public class XmppConnectionService extends Service {
account.pendingConferenceJoins.remove(conversation);
account.pendingConferenceLeaves.remove(conversation);
if (account.getStatus() == Account.State.ONLINE) {
- sendPresencePacket(account, mPresenceGenerator.leave(conversation.getMucOptions()));
+
+ // disabled for testing strange MUC leaves
+ // sendPresencePacket(account, mPresenceGenerator.leave(conversation.getMucOptions()));
+ //
conversation.resetMucOptions();
if (onConferenceJoined != null) {
conversation.getMucOptions().flagNoAutoPushConfiguration();