diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-08-31 15:44:48 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-08-31 15:44:48 +0200 |
commit | 987744bb2546d3df2c083f34b1c6b8a12453db1b (patch) | |
tree | f5744c6bd4c2e93a4f5404fb6f39a82aa349aff6 /src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | |
parent | cce36fcbb7834f731e5117981ef5f55f27ec11a2 (diff) |
fixed unlikely race between enabling carbons and discovering last MAM id
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 596975cd1..9ff9e8bce 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -1298,9 +1298,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()); @@ -1308,6 +1305,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) { |