~singpolyma/cheogram-android

0385e3a8d62ebe68a8c40a75ea95d3726d3839f3 — Daniel Gultsch 8 years ago e94e062
switched around info and items query to avoid race condition
1 files changed, 1 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
M src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java => src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +1 -1
@@ 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();
	}