commit c14a6e620e00d99a8003e0d69eb154fe2fde06c7
author Fabrice Di Meglio <fdimeglio@google.com> Fri May 21 20:11:04 2010 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Mon Jun 14 15:11:12 2010 -0700
tree 6f6d1fc30da4e6a5ccc2579850935b933923fe27
parent 2514bf94e30f75db88a5a2c5394694a8f8b8cdd4

Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)

- update Events.DELETE constant

Change-Id: I3876025d8052d291029ad2bc2bfde2ed241dda2d

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 cfefb67..7869ea7 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -1649,7 +1649,7 @@
             }
 
             // Send exception deleted flag if necessary
-            Integer deleted = entityValues.getAsInteger(Events.DELETED);
+            Integer deleted = entityValues.getAsInteger(Calendar.EventsColumns.DELETED);
             boolean isDeleted = deleted != null && deleted == 1;
             Integer eventStatus = entityValues.getAsInteger(Events.STATUS);
             boolean isCanceled = eventStatus != null && eventStatus.equals(Events.STATUS_CANCELED);
@@ -1789,7 +1789,7 @@
                         cr.update(ContentUris.withAppendedId(EVENTS_URI, eventId), cidValues,
                                 null, null);
                     } else {
-                        if (entityValues.getAsInteger(Events.DELETED) == 1) {
+                        if (entityValues.getAsInteger(Calendar.EventsColumns.DELETED) == 1) {
                             userLog("Deleting event with serverId: ", serverId);
                             s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
                             mDeletedIdList.add(eventId);
@@ -1855,7 +1855,7 @@
                                     exEntity.addSubValue(ncv.uri, ncv.values);
                                 }
 
-                                if ((getInt(exValues, Events.DELETED) == 1) ||
+                                if ((getInt(exValues, Calendar.EventsColumns.DELETED) == 1) ||
                                         (getInt(exValues, Events.STATUS) ==
                                             Events.STATUS_CANCELED)) {
                                     flag = Message.FLAG_OUTGOING_MEETING_CANCEL;