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

Fix issue with deleted recurrence

Browse Source 
* It turns out that this bug is due to a bad rebase/merge for a previous CL
  in which the changed code appears in its new form AND old form
* Fixes change SHA c3aa318200 (CL 48406)
* Don't say it.

Bug: 2587775
Change-Id: I3f70a97e498db30345452b942909448049680fdf
This commit is contained in:
Marc Blank 2010-04-13 17:12:56 -07:00
parent c07cd159d4
commit 627006a8e3
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1552,6 +1552,15 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
(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;
if (!selfOrganizer) {
// Send a cancellation notice to the organizer
// Since CalendarProvider2 sets the organizer of exceptions
// to the user, we have to reset it first to the original
// organizer
exValues.put(Events.ORGANIZER,
entityValues.getAsString(Events.ORGANIZER));
sendDeclinedEmail(exEntity, clientId);
}
} else { } else {
flag = Message.FLAG_OUTGOING_MEETING_INVITE; flag = Message.FLAG_OUTGOING_MEETING_INVITE;
} }
@ -1573,28 +1582,6 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
entityValues.getAsString(Events.EVENT_LOCATION)); entityValues.getAsString(Events.EVENT_LOCATION));
} }
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;
if (!selfOrganizer) {
// Send a cancellation notice to the organizer
// Since CalendarProvider2 sets the organizer of exceptions
// to the user, we have to reset it first to the original
// organizer
exValues.put(Events.ORGANIZER,
entityValues.getAsString(Events.ORGANIZER));
sendDeclinedEmail(exEntity, clientId);
}
} else {
mUploadedIdList.add(exEventId);
flag = Message.FLAG_OUTGOING_MEETING_INVITE;
}
if (selfOrganizer) { if (selfOrganizer) {
Message msg = Message msg =
CalendarUtilities.createMessageForEntity(mContext, CalendarUtilities.createMessageForEntity(mContext,