From ecaddea386c9be97fffaee8fa6a2a7d759516ab5 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Fri, 21 May 2010 20:11:04 -0700 Subject: [PATCH] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java index cfefb6798..7869ea745 100644 --- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java +++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java @@ -1649,7 +1649,7 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter { } // 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 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter { 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 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter { 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;