narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

try to fix messages stuck at sending

Browse source
This commit is contained in:
Daniel Gultsch 2016-10-06 17:23:35 +02:00
parent 082c06a486
commit 8d8cb92e43
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -326,7 +326,7 @@ public class XmppConnectionService extends Service {
} }
account.pendingConferenceJoins.clear(); account.pendingConferenceJoins.clear();
scheduleWakeUpCall(Config.PUSH_MODE ? Config.PING_MIN_INTERVAL : Config.PING_MAX_INTERVAL, account.getUuid().hashCode()); 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); resetSendingToWaiting(account);
final boolean disabled = account.isOptionSet(Account.OPTION_DISABLED); final boolean disabled = account.isOptionSet(Account.OPTION_DISABLED);
final boolean listeners = checkListeners(); final boolean listeners = checkListeners();
@ -2891,6 +2891,7 @@ public class XmppConnectionService extends Service {
} }
public void resetSendingToWaiting(Account account) { public void resetSendingToWaiting(Account account) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": reset 'sending' messages to 'waiting'");
for (Conversation conversation : getConversations()) { for (Conversation conversation : getConversations()) {
if (conversation.getAccount() == account) { if (conversation.getAccount() == account) {
conversation.findUnsentTextMessages(new Conversation.OnMessageFound() { conversation.findUnsentTextMessages(new Conversation.OnMessageFound() {

1
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -1066,6 +1066,7 @@ public class XmppConnection implements Runnable {
mStanzaQueue.clear(); mStanzaQueue.clear();
} }
} }
mXmppConnectionService.resetSendingToWaiting(account);
features.carbonsEnabled = false; features.carbonsEnabled = false;
features.blockListRequested = false; features.blockListRequested = false;
synchronized (this.disco) { synchronized (this.disco) {