commit e96bd20257c47db94f9166fd37ca00e0c73788af
author Marc Blank <mblank@google.com> Mon Mar 08 21:48:27 2010 -0800
committer Marc Blank <mblank@google.com> Tue Mar 09 13:16:39 2010 -0800
tree 66439c304c96d778bbd89da77573b5cf482cf6d3
parent 93bb4391fedce739f31c7d3f8ee108a4f26d874c

Only clear dirty flag if we're sure the events were uploaded

* Add new/changed id's to a list, and only clear the dirty flag for
  list members
* The implementation is analogous to how deleted items are handled

Bug: 2492857
Change-Id: I3353100ab307a45a5ab684d402253eb589f22008

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

diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 952a555..a2f122e 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -104,7 +104,7 @@
     private long mCalendarId = -1;
 
     private ArrayList<Long> mDeletedIdList = new ArrayList<Long>();
-    private ArrayList<Long> mUpdatedIdList = new ArrayList<Long>();
+    private ArrayList<Long> mUploadedIdList = new ArrayList<Long>();
     private ArrayList<Long> mSendCancelIdList = new ArrayList<Long>();
 
     private String[] mCalendarIdArgument;
@@ -836,18 +836,24 @@
             mOps.execute();
 
             if (mOps.mResults != null) {
-                // Clear dirty flags for Events sent to server
-                ContentValues cv = new ContentValues();
-                cv.put(Events._SYNC_DIRTY, 0);
-                mContentResolver.update(sEventsUri, cv, DIRTY_IN_CALENDAR,
-                        new String[] {Long.toString(mCalendarId)});
-                // Send meeting cancelation notices
-                // Really delete the events...
-                for (long eventId: mDeletedIdList) {
-                    mContentResolver.delete(ContentUris.withAppendedId(sEventsUri, eventId),
-                            null, null);
+                // Clear dirty flags for updates sent to server
+                if (!mUploadedIdList.isEmpty())  {
+                    ContentValues cv = new ContentValues();
+                    cv.put(Events._SYNC_DIRTY, 0);
+                    for (long eventId: mUploadedIdList) {
+                        mContentResolver.update(ContentUris.withAppendedId(sEventsUri, eventId), cv,
+                                null, null);
+                    }
+                    mUploadedIdList.clear();
                 }
-                mDeletedIdList.clear();
+                // Delete events marked for deletion
+                if (!mDeletedIdList.isEmpty()) {
+                    for (long eventId: mDeletedIdList) {
+                        mContentResolver.delete(ContentUris.withAppendedId(sEventsUri, eventId),
+                                null, null);
+                    }
+                    mDeletedIdList.clear();
+                }
             }
         }
 
@@ -1364,7 +1370,7 @@
                     }
 
                     s.end().end(); // ApplicationData & Change
-                    mUpdatedIdList.add(entityValues.getAsLong(Events._ID));
+                    mUploadedIdList.add(eventId);
 
                     // Send the meeting invite if there are attendees and we're the organizer
                     boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mAccount.mEmailAddress);