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

Fix problem with Event creation by EAS calendar sync

Browse Source 
* Turns out that DURATION is required by CalendarProvider, and
  DTEND has a different meaning than it does to EAS
* Fix downsync to create proper recurring events

Change-Id: Ibf85422de73579a93de89b2c27c13f96994bedc8
This commit is contained in:
Marc Blank 2010-01-28 11:37:39 -08:00
parent f3fcb8929e
commit d99dbf01fb
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,8 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
boolean firstTag = true;
long eventId = -1;
long startTime = -1;
long endTime = -1;
while (nextTag(Tags.SYNC_APPLICATION_DATA) != END) {
if (update && firstTag) {
// Find the event that's being updated
@ -253,12 +255,12 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
}
break;
case Tags.CALENDAR_START_TIME:
long startTime = CalendarUtilities.parseDateTime(getValue());
startTime = CalendarUtilities.parseDateTime(getValue());
cv.put(Events.DTSTART, startTime);
cv.put(Events.ORIGINAL_INSTANCE_TIME, startTime);
break;
case Tags.CALENDAR_END_TIME:
cv.put(Events.DTEND, CalendarUtilities.parseDateTime(getValue()));
endTime = CalendarUtilities.parseDateTime(getValue());
break;
case Tags.CALENDAR_EXCEPTIONS:
exceptionsParser(ops, cv);
@ -308,6 +310,19 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
}
}
// If there's no recurrence, set DTEND to the end time
if (!cv.containsKey(Events.RRULE)) {
cv.put(Events.DTEND, endTime);
cv.put(Events.LAST_DATE, endTime);
}
// Set the DURATION using rfc2445
if (allDayEvent != 0) {
cv.put(Events.DURATION, "P1D");
} else {
cv.put(Events.DURATION, "P" + ((endTime - startTime) / MINUTES) + "M");
}
// Put the real event in the proper place in the ops ArrayList
if (eventOffset >= 0) {
ops.set(eventOffset, ContentProviderOperation
@ -447,6 +462,8 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
if (!cv.containsKey(Events.DTEND)) {
cv.put(Events.DTEND, parentCv.getAsLong(Events.DTEND));
}
// TODO See if this is necessary
//cv.put(Events.LAST_DATE, cv.getAsLong(Events.DTEND));
ops.newException(cv);
}