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

Fix #2492864 (Upsync failures in Exchange 2003) 

* Of all crazy things, Exchange 2003 doesn't like uploading the organizer's
  email/name in changes.  This isn't documented anywhere.
* Don't send up organizer name/email on changes.

Bug: 2492864
Change-Id: I1f2aefb6f9020025578325c5c7b3cf869f17e27f
This commit is contained in:
Marc Blank 2010-03-05 17:53:56 -08:00
parent 99feed44ec
commit 54181220e2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1002,6 +1002,7 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
ContentValues entityValues = entity.getEntityValues();
boolean isException = (clientId == null);
boolean hasAttendees = false;
boolean isChange = entityValues.containsKey(Events._SYNC_ID);
if (!isException) {
// A time zone is required in all EAS events; we'll use the default if none is set
@ -1075,7 +1076,11 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
}
}
s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);
// We only write organizer email if the event is new (not a change)
// Exchange 2003 will reject upsyncs of changed events with organizer email
if (!isChange) {
s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);
}
String rrule = entityValues.getAsString(Events.RRULE);
if (rrule != null) {
@ -1153,7 +1158,10 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
if (hasAttendees) {
s.end(); // Attendees
}
if (organizerName != null) {
// We only write organizer name if the event is new (not a change)
// Exchange 2003 will reject upsyncs of changed events with organizer name
if (!isChange && organizerName != null) {
s.data(Tags.CALENDAR_ORGANIZER_NAME, organizerName);
}
} else {