commit 9fe176d6f22a06d42229ffce9b2bc85a1c7f86a1
author Tony Mantler <nicoya@google.com> Tue Sep 17 20:53:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 17 20:53:43 2013 +0000
tree c2969bbbfe516af5457c2066c9b0a330f34f43bc
parent 94599580f738c4700174be250ecf7392768a432b
parent 42229b06c62c4126cca8d4c243e98066176cf7c2

Merge "Add a selection parameter to deletion so that the calendar provider doesn't complain" into jb-ub-mail-ur10

src/com/android/exchange/eas/EasSync.java

diff --git a/src/com/android/exchange/eas/EasSync.java b/src/com/android/exchange/eas/EasSync.java
index c70386e..6703a0c 100644
--- a/src/com/android/exchange/eas/EasSync.java
+++ b/src/com/android/exchange/eas/EasSync.java
@@ -22,6 +22,7 @@
 import android.content.SyncResult;
 import android.database.Cursor;
 import android.support.v4.util.LongSparseArray;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 
 import com.android.emailcommon.provider.Account;
@@ -35,6 +36,7 @@
 import com.android.exchange.adapter.Parser;
 import com.android.exchange.adapter.Serializer;
 import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
 
 import org.apache.http.HttpEntity;
 
@@ -129,11 +131,24 @@
                                 Mailbox.ProjectionSyncData.COLUMN_SERVER_ID);
                         mMailboxSyncKey = mailboxCursor.getString(
                                 Mailbox.ProjectionSyncData.COLUMN_SYNC_KEY);
-                        final int result = performOperation(syncResult);
+                        final int result;
+                        if (TextUtils.isEmpty(mMailboxSyncKey) || mMailboxSyncKey.equals("0")) {
+                            // For some reason we can get here without a valid mailbox sync key
+                            // b/10797675
+                            // TODO: figure out why and clean this up
+                            LogUtils.d(LOG_TAG,
+                                    "Tried to sync mailbox with invalid mailbox sync key");
+                            result = -1;
+                        } else {
+                            result = performOperation(syncResult);
+                        }
                         if (result == 0) {
                             handleMessageUpdateStatus(mMessageUpdateStatus, messageIds, counts);
                         } else {
-                            // TODO: Retry or revert in this case?
+                            for (final MessageStateChange msc : mStateChanges) {
+                                messageIds[1][counts[1]] = msc.getMessageId();
+                                ++counts[1];
+                            }
                         }
                     }
                 } finally {