From 9d8d1e5dbf78640083d25e07bbf47041c77c0993 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Mon, 12 Apr 2010 11:14:26 -0700 Subject: Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events) - fix RecurrenceSet so that all day recurring events have a UTC timezone set - code formatting Change-Id: Iaa622a696d9d995d9921dd721130ef02dc64aa6b --- core/java/android/pim/RecurrenceSet.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'core/java/android/pim/RecurrenceSet.java') diff --git a/core/java/android/pim/RecurrenceSet.java b/core/java/android/pim/RecurrenceSet.java index 635323e..282417d 100644 --- a/core/java/android/pim/RecurrenceSet.java +++ b/core/java/android/pim/RecurrenceSet.java @@ -181,7 +181,9 @@ public class RecurrenceSet { boolean inUtc = start.parse(dtstart); boolean allDay = start.allDay; - if (inUtc) { + // We force TimeZone to UTC for "all day recurring events" as the server is sending no + // TimeZone in DTSTART for them + if (inUtc || allDay) { tzid = Time.TIMEZONE_UTC; } @@ -204,10 +206,7 @@ public class RecurrenceSet { } if (allDay) { - // TODO: also change tzid to be UTC? that would be consistent, but - // that would not reflect the original timezone value back to the - // server. - start.timezone = Time.TIMEZONE_UTC; + start.timezone = Time.TIMEZONE_UTC; } long millis = start.toMillis(false /* use isDst */); values.put(Calendar.Events.DTSTART, millis); -- cgit v1.1