aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-20 15:28:01 +0100
committerChristian S <christian@pix-art.de>2016-02-20 15:28:01 +0100
commitfe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch)
tree562388d395f2547b85c49d8979dbab6193d08199 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
parent2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff)
parent3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java2
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 3ddad1fdb..dc6021284 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1077,10 +1077,10 @@ public class XmppConnection implements Runnable {
if (mPendingServiceDiscoveries == 0) {
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": done with service discovery");
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": online with resource " + account.getResource());
- changeStatus(Account.State.ONLINE);
if (bindListener != null) {
bindListener.onBind(account);
}
+ changeStatus(Account.State.ONLINE);
}
}
}