fixed unlikely race between enabling carbons and discovering last MAM id

Daniel Gultsch created 6 years ago

Change summary

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 6 ++--
1 file changed, 3 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -1254,9 +1254,6 @@ public class XmppConnection implements Runnable {
     }
 
     private void enableAdvancedStreamFeatures() {
-        if (getFeatures().carbons() && !features.carbonsEnabled) {
-            sendEnableCarbons();
-        }
         if (getFeatures().blocking() && !features.blockListRequested) {
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": Requesting block list");
             this.sendIqPacket(getIqGenerator().generateGetBlockList(), mXmppConnectionService.getIqParser());
@@ -1264,6 +1261,9 @@ public class XmppConnection implements Runnable {
         for (final OnAdvancedStreamFeaturesLoaded listener : advancedStreamFeaturesLoadedListeners) {
             listener.onAdvancedStreamFeaturesAvailable(account);
         }
+        if (getFeatures().carbons() && !features.carbonsEnabled) {
+            sendEnableCarbons();
+        }
     }
 
     private void sendServiceDiscoveryItems(final Jid server) {