aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-09-21 12:55:40 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-23 22:19:01 +0200
commit7b2cecde1967c64b46f862b971b4afb5d29dbf7e (patch)
treeac6f42d72f49985444eefbd56f573af5cc56bafd /src/main/java/de
parent0443a77d669bdcca4b3651544e7162b57f61af45 (diff)
don't wait for disco when not having stream managment
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/XmppConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 41fab523d..a70c8e0c3 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -1085,7 +1085,7 @@ public class XmppConnection implements Runnable {
this.disco.clear();
}
mPendingServiceDiscoveries.set(0);
- mWaitForDisco.set(mServerIdentity != Identity.NIMBUZZ);
+ mWaitForDisco.set(mServerIdentity != Identity.NIMBUZZ && smVersion != 0);
lastDiscoStarted = SystemClock.elapsedRealtime();
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": starting service discovery");
mXmppConnectionService.scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());