aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-15 15:13:35 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-15 15:13:35 +0100
commit8cd59bb944ed9373eb04420a32f3b7cfce0a8956 (patch)
treed25bce32c4d272358984d50241320062f1c3008a /src/eu/siacs/conversations/xmpp/XmppConnection.java
parent841c6e04a9da5f8eaf00b5140da7b7934ad3cbe3 (diff)
better muc invitations. clearified the creation of ad hoc mucs with an alert dialog
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index dadd310aa..0fbd6f774 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -220,6 +220,7 @@ public class XmppConnection implements Runnable {
tagWriter.writeStanzaAsync(r);
} else if (nextTag.isStart("resumed")) {
tagReader.readElement(nextTag);
+ sendPing();
changeStatus(Account.STATUS_ONLINE);
Log.d(LOGTAG,account.getJid()+": session resumed");
} else if (nextTag.isStart("r")) {
@@ -543,10 +544,6 @@ public class XmppConnection implements Runnable {
String resource = packet.findChild("bind").findChild("jid")
.getContent().split("/")[1];
account.setResource(resource);
- if (bindListener !=null) {
- bindListener.onBind(account);
- }
- account.setStatus(Account.STATUS_ONLINE);
if (streamFeatures.hasChild("sm")) {
EnablePacket enable = new EnablePacket();
tagWriter.writeStanzaAsync(enable);
@@ -554,9 +551,10 @@ public class XmppConnection implements Runnable {
sendInitialPresence();
sendServiceDiscoveryInfo();
sendServiceDiscoveryItems();
- if (statusListener != null) {
- statusListener.onStatusChanged(account);
+ if (bindListener !=null) {
+ bindListener.onBind(account);
}
+ account.setStatus(Account.STATUS_ONLINE);
}
});
}