moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-15 13:35:04 -05:00
Code Issues Releases Wiki Activity

switched around info and items query to avoid race condition

Browse Source
This commit is contained in:
Daniel Gultsch 2016-04-04 20:35:40 +02:00
parent e94e06246b
commit 0385e3a8d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -1016,7 +1016,6 @@ public class XmppConnection implements Runnable {
lastDiscoStarted = SystemClock.elapsedRealtime(); lastDiscoStarted = SystemClock.elapsedRealtime();
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": starting service discovery"); Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": starting service discovery");
mXmppConnectionService.scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode()); mXmppConnectionService.scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
sendServiceDiscoveryItems(account.getServer());
Element caps = streamFeatures.findChild("c"); Element caps = streamFeatures.findChild("c");
final String hash = caps == null ? null : caps.getAttribute("hash"); final String hash = caps == null ? null : caps.getAttribute("hash");
final String ver = caps == null ? null : caps.getAttribute("ver"); final String ver = caps == null ? null : caps.getAttribute("ver");
@ -1031,6 +1030,7 @@ public class XmppConnection implements Runnable {
disco.put(account.getServer(), discoveryResult); disco.put(account.getServer(), discoveryResult);
} }
sendServiceDiscoveryInfo(account.getJid().toBareJid()); sendServiceDiscoveryInfo(account.getJid().toBareJid());
sendServiceDiscoveryItems(account.getServer());
this.lastSessionStarted = SystemClock.elapsedRealtime(); this.lastSessionStarted = SystemClock.elapsedRealtime();
} }