make config flag for leave before join

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index bb7162bb3..5028fea28 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1581,7 +1581,7 @@ public class XmppConnectionService extends Service {
 
         final boolean inProgressJoin;
         synchronized (account.inProgressConferenceJoins) {
-            inProgressJoin = conversation.getMode() == Conversational.MODE_MULTI && account.inProgressConferenceJoins.contains(conversation);
+            inProgressJoin = conversation.getMode() == Conversational.MODE_MULTI && (account.inProgressConferenceJoins.contains(conversation) || account.pendingConferenceJoins.contains(conversation));
         }
 
         if (account.isOnlineAndConnected() && !inProgressJoin) {
@@ -2819,7 +2819,9 @@ public class XmppConnectionService extends Service {
             synchronized (account.inProgressConferenceJoins) {
                 account.inProgressConferenceJoins.add(conversation);
             }
-            sendPresencePacket(account, mPresenceGenerator.leave(conversation.getMucOptions()));
+            if (Config.MUC_LEAVE_BEFORE_JOIN) {
+                sendPresencePacket(account, mPresenceGenerator.leave(conversation.getMucOptions()));
+            }
             conversation.resetMucOptions();
             if (onConferenceJoined != null) {
                 conversation.getMucOptions().flagNoAutoPushConfiguration();