diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-19 12:49:24 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-19 12:49:24 +0200 |
| commit | c9b2638778237b128879bb638932414beef81a4d (patch) | |
| tree | 75c68070c2e16f8bdbc9c51ba3da47c443c3b2e0 /src/main | |
| parent | dafcee6a5bff1ed1938329a8b3d4555d893e8fff (diff) | |
| parent | 52f0622dd3b3d74311f9326ac523dad17b98356a (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 92d99222..0ffe4e37 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/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()); |