diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-16 13:42:20 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-16 13:42:20 +0200 |
| commit | aa68045c58246861186b32e34c021809f1fb69bb (patch) | |
| tree | d9713d1b08392f3656a94a515635150e584afe39 /src/eu/siacs/conversations/xmpp | |
| parent | c8f8bab2a1caa4eb828dea8048f82c05a4f4b539 (diff) | |
offline sending of pgp fixed
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/xmpp/XmppConnection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java index adb27ec8c..3fc6385a0 100644 --- a/src/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java @@ -111,7 +111,7 @@ public class XmppConnection implements Runnable { protected void changeStatus(int nextStatus) { if (account.getStatus() != nextStatus) { - if ((nextStatus == Account.STATUS_OFFLINE)&&(account.getStatus() != Account.STATUS_CONNECTING)&&(account.getStatus() != Account.STATUS_ONLINE)) { + if ((nextStatus == Account.STATUS_OFFLINE)&&(account.getStatus() != Account.STATUS_CONNECTING)&&(account.getStatus() != Account.STATUS_ONLINE)&&(account.getStatus() != Account.STATUS_DISABLED)) { return; } account.setStatus(nextStatus); @@ -257,10 +257,10 @@ public class XmppConnection implements Runnable { RequestPacket r = new RequestPacket(smVersion); tagWriter.writeStanzaAsync(r); } else if (nextTag.isStart("resumed")) { + Log.d(LOGTAG,account.getJid()+": session resumed"); tagReader.readElement(nextTag); sendPing(); changeStatus(Account.STATUS_ONLINE); - Log.d(LOGTAG,account.getJid()+": session resumed"); } else if (nextTag.isStart("r")) { tagReader.readElement(nextTag); AckPacket ack = new AckPacket(this.stanzasReceived,smVersion); |