narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

wait with status change to online after all disco queries have been made

Browse source
This commit is contained in:
Daniel Gultsch 2015-12-09 11:16:03 +01:00
parent 11e58607c9
commit 5e151c7311
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -116,6 +116,7 @@ public class XmppConnection implements Runnable {
private long lastPingSent = 0;
private long lastConnect = 0;
private long lastSessionStarted = 0;
private int mPendingServiceDiscoveries = 0;
private boolean mInteractive = false;
private int attempt = 0;
private final Hashtable<String, Pair<IqPacket, OnIqPacketReceived>> packetCallbacks = new Hashtable<>();
@ -926,18 +927,16 @@ public class XmppConnection implements Runnable {
synchronized (this.disco) {
this.disco.clear();
}
mPendingServiceDiscoveries = 0;
sendServiceDiscoveryItems(account.getServer());
sendServiceDiscoveryInfo(account.getServer());
sendServiceDiscoveryInfo(account.getJid().toBareJid());
sendServiceDiscoveryItems(account.getServer());
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": online with resource " + account.getResource());
this.lastSessionStarted = SystemClock.elapsedRealtime();
changeStatus(Account.State.ONLINE);
if (bindListener != null) {
bindListener.onBind(account);
}
}
private void sendServiceDiscoveryInfo(final Jid jid) {
mPendingServiceDiscoveries++;
final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
iq.setTo(jid);
iq.query("http://jabber.org/protocol/disco#info");
@ -988,6 +987,16 @@ public class XmppConnection implements Runnable {
} else {
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could not query disco info for " + jid.toString());
}
if (packet.getType() != IqPacket.TYPE.TIMEOUT) {
mPendingServiceDiscoveries--;
if (mPendingServiceDiscoveries <= 0) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": done with service discovery");
changeStatus(Account.State.ONLINE);
if (bindListener != null) {
bindListener.onBind(account);
}
}
}
}
});
}