Merge change Idef455f3 into eclair-mr2
* changes: Handle case of moreAvailable true with no changes (#2189704)
This commit is contained in:
commit
dc9bc35bb1
@ -140,7 +140,10 @@ public abstract class AbstractSyncParser extends Parser {
|
|||||||
mAdapter.setSyncKey(newKey, true);
|
mAdapter.setSyncKey(newKey, true);
|
||||||
cv.put(MailboxColumns.SYNC_KEY, newKey);
|
cv.put(MailboxColumns.SYNC_KEY, newKey);
|
||||||
mailboxUpdated = true;
|
mailboxUpdated = true;
|
||||||
}
|
} else if (moreAvailable) {
|
||||||
|
userLog("!! SyncKey hasn't changed, setting moreAvailable = false");
|
||||||
|
moreAvailable = false;
|
||||||
|
}
|
||||||
// If we were pushing (i.e. auto-start), now we'll become ping-triggered
|
// If we were pushing (i.e. auto-start), now we'll become ping-triggered
|
||||||
if (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
|
if (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
|
||||||
mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PING;
|
mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PING;
|
||||||
|
Loading…
Reference in New Issue
Block a user