Always add changed exceptions to the upload list
* We were adding deleted exceptions to the "deleted" list; this is bad, because the exception then gets deleted from the database after the sync. The symptom is that the deleted exception reappears on the calendar. Bug: 2587837 Change-Id: If497f82ba0b2b817d1cef6165ded23d19876528f
This commit is contained in:
parent
6a4eae5f41
commit
c5c5bf7da7
@ -1531,18 +1531,17 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
|
||||
// attendees about it
|
||||
long exEventId = exValues.getAsLong(Events._ID);
|
||||
int flag;
|
||||
|
||||
if ((getInt(exValues, Events.DELETED) == 1) ||
|
||||
(getInt(exValues, Events.STATUS) ==
|
||||
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;
|
||||
} else {
|
||||
mUploadedIdList.add(exEventId);
|
||||
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
|
||||
// attendees when preparing the message
|
||||
|
Loading…
Reference in New Issue
Block a user