commit 033275d635db28638226c7d4da90b6f32679ef84
author Marc Blank <mblank@google.com> Thu May 31 17:24:53 2012 -0700
committer Marc Blank <mblank@google.com> Thu May 31 17:32:46 2012 -0700
tree d802987b6355e831f4a8ead0a98f0260d7860197
parent 69cd034720c3348a84758c817a67034345b6a801

Don't reset account sync key from 0 when folders are bad

Bug: 6578066
Change-Id: I3507da28032c05dae90f0f55003df07f8cf4bcc3

exchange2/src/com/android/exchange/adapter/FolderSyncParser.java

diff --git a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java b/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
index 59e4245..9b91cd6 100644
--- a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -207,8 +207,13 @@
                     }
                 }
             } else if (tag == Tags.FOLDER_SYNC_KEY) {
-                mAccount.mSyncKey = getValue();
-                userLog("New Account SyncKey: ", mAccount.mSyncKey);
+                String newKey = getValue();
+                if (!resetFolders) {
+                    mAccount.mSyncKey = newKey;
+                    userLog("New syncKey: ", newKey);
+                } else {
+                    userLog("Ignoring new syncKey: ", newKey);
+                }
             } else if (tag == Tags.FOLDER_CHANGES) {
                 if (mStatusOnly) return res;
                 changesParser(mOperations, mInitialSync);