aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-17 22:03:12 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-17 22:03:12 +0200
commitb79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (patch)
tree6f8f258bcfd6d52f6714ff40636b9ee3801d624c /src
parent2abb57be34effbb0606ae099bfefee472542662e (diff)
parent66aacf7e3edae1e4a6ec6cab72df82ae38daa096 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index a04105a8..6e55ebfe 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -542,13 +542,6 @@ public class XmppConnection implements Runnable {
this.tagWriter.writeStanzaAsync(resume);
} else if (this.streamFeatures.hasChild("bind") && shouldBind) {
sendBindRequest();
- if (this.streamFeatures.hasChild("session")) {
- Log.d(LOGTAG,account.getJid()+": sending deprecated session");
- IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
- startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("")
- startSession.setId(nextRandomId());
- this.sendPacket(startSession, null);
- }
}
}
@@ -655,9 +648,17 @@ public class XmppConnection implements Runnable {
if (bindListener !=null) {
bindListener.onBind(account);
}
+
changeStatus(Account.STATUS_ONLINE);
}
});
+ if (this.streamFeatures.hasChild("session")) {
+ Log.d(LOGTAG,account.getJid()+": sending deprecated session");
+ IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
+ startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("")
+ startSession.setId(nextRandomId());
+ this.sendPacket(startSession, null);
+ }
}
private void sendServiceDiscoveryInfo(final String server) {