ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio 2010-06-14 15:11:40 -07:00 committed by Android (Google) Code Review
commit 200afe8c36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/exchange/adapter/CalendarSyncAdapter.java
View File

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