Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 
1 file changed, 1 insertion(+)

Detailed changes

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -277,6 +277,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				}
 				scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
 			} else if (account.getStatus() == Account.State.OFFLINE) {
+				resetSendingToWaiting(account);
 				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 					int timeToReconnect = mRandom.nextInt(20) + 10;
 					scheduleWakeUpCall(timeToReconnect,account.getUuid().hashCode());