Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2015-08-19 12:49:24 +02:00
commit c9b2638778
1 changed files with 1 additions and 0 deletions

View File

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