diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-10-08 10:27:34 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-10-08 10:27:34 +0200 |
| commit | 8e15e4020c8d1f3b2756b701da049cdd1ea595ef (patch) | |
| tree | bd05f3f1b60f25c1b2212edf43a89a22a9c78b38 /src | |
| parent | 7437ee12fdb152aa4e060b84ca538e00b070a2f6 (diff) | |
try to fix messages stuck at sending
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index c217cbb47..3eccd9565 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -334,7 +334,7 @@ public class XmppConnectionService extends Service { } account.pendingConferenceJoins.clear(); scheduleWakeUpCall(Config.PUSH_MODE ? Config.PING_MIN_INTERVAL : Config.PING_MAX_INTERVAL, account.getUuid().hashCode()); - } else if (account.getStatus() == Account.State.OFFLINE) { + } else if (account.getStatus() == Account.State.OFFLINE || account.getStatus() == Account.State.DISABLED) { resetSendingToWaiting(account); final boolean disabled = account.isOptionSet(Account.OPTION_DISABLED); final boolean listeners = checkListeners(); @@ -3012,6 +3012,7 @@ public class XmppConnectionService extends Service { } public void resetSendingToWaiting(Account account) { + Log.d(Config.LOGTAG,account.getJid().toBareJid()+": reset 'sending' messages to 'waiting'"); for (Conversation conversation : getConversations()) { if (conversation.getAccount() == account) { conversation.findUnsentTextMessages(new Conversation.OnMessageFound() { diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 87afcdcee..318e91d34 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -1088,7 +1088,8 @@ public class XmppConnection implements Runnable { mStanzaQueue.clear(); } } - features.carbonsEnabled = false; + mXmppConnectionService.resetSendingToWaiting(account); + features.carbonsEnabled = false; features.blockListRequested = false; synchronized (this.disco) { this.disco.clear(); |