diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-04-04 20:35:40 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-04-04 20:35:40 +0200 |
| commit | 0385e3a8d62ebe68a8c40a75ea95d3726d3839f3 (patch) | |
| tree | a62bb391c16836ab589c76800944ea66ef551495 /src/main/java/eu/siacs/conversations | |
| parent | e94e06246b007b5991c1f03e30f5b2ab8604d712 (diff) | |
switched around info and items query to avoid race condition
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index b3fd122ff..58e510e12 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1016,7 +1016,6 @@ public class XmppConnection implements Runnable { lastDiscoStarted = SystemClock.elapsedRealtime(); Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": starting service discovery"); mXmppConnectionService.scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode()); - sendServiceDiscoveryItems(account.getServer()); Element caps = streamFeatures.findChild("c"); final String hash = caps == null ? null : caps.getAttribute("hash"); final String ver = caps == null ? null : caps.getAttribute("ver"); @@ -1031,6 +1030,7 @@ public class XmppConnection implements Runnable { disco.put(account.getServer(), discoveryResult); } sendServiceDiscoveryInfo(account.getJid().toBareJid()); + sendServiceDiscoveryItems(account.getServer()); this.lastSessionStarted = SystemClock.elapsedRealtime(); } |