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

Merge "Always add changed exceptions to the upload list" into froyo

Browse Source
This commit is contained in:
Marc Blank 2010-04-12 09:57:57 -07:00 committed by Android (Google) Code Review
commit 536a36555b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1531,18 +1531,17 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
// attendees about it // attendees about it
long exEventId = exValues.getAsLong(Events._ID); long exEventId = exValues.getAsLong(Events._ID);
int flag; int flag;
if ((getInt(exValues, Events.DELETED) == 1) || if ((getInt(exValues, Events.DELETED) == 1) ||
(getInt(exValues, Events.STATUS) == (getInt(exValues, Events.STATUS) ==
Events.STATUS_CANCELED)) { Events.STATUS_CANCELED)) {
// Add the eventId of the exception to the proper list, so that
// the dirty bit is cleared or the event is deleted after the
// sync has completed
mDeletedIdList.add(exEventId);
flag = Message.FLAG_OUTGOING_MEETING_CANCEL; flag = Message.FLAG_OUTGOING_MEETING_CANCEL;
} else { } else {
mUploadedIdList.add(exEventId);
flag = Message.FLAG_OUTGOING_MEETING_INVITE; flag = Message.FLAG_OUTGOING_MEETING_INVITE;
} }
// Add the eventId of the exception to the uploaded id list, so that
// the dirty/mark bits are cleared
mUploadedIdList.add(exEventId);
// Copy subvalues into the exception; otherwise, we won't see the // Copy subvalues into the exception; otherwise, we won't see the
// attendees when preparing the message // attendees when preparing the message