commit 0c7edfa747af9fdaa75550e2d6d50faf254ef599
author Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 13:56:10 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 13:56:10 2009 -0400
tree fb100a06bf3ea5b17a7ee4ed11df816e8ebeea4b
parent d57a0573c844d656a72a3f9ddbfb8478448fb487
parent 5bd8d6f8310305bce81071ade6ebdb42dbed6b72

Merge change If12d0e7c into eclair

* changes:
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 77f3260..0f2a345 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -208,6 +208,12 @@
             userLog("Validation (OPTIONS) response: " + code);
             if (code == HttpStatus.SC_OK) {
                 // No exception means successful validation
+                Header commands = resp.getFirstHeader("MS-ASProtocolCommands");
+                Header versions = resp.getFirstHeader("ms-asprotocolversions");
+                if (commands == null || versions == null) {
+                    userLog("OPTIONS response without commands or versions; reporting I/O error");
+                    throw new MessagingException(MessagingException.IOERROR);
+                }
                 userLog("Validation successful");
                 return;
             }

src/com/android/exchange/adapter/AbstractSyncParser.java

diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index c913af4..4c73fd8 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -140,7 +140,10 @@
                     mAdapter.setSyncKey(newKey, true);
                     cv.put(MailboxColumns.SYNC_KEY, newKey);
                     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 (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
                     mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PING;