From d6ff9038ce09e1c5eb507fc8d884708bc706d306 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 16 Oct 2014 09:02:18 -0400 Subject: [PATCH] Disable timezone in AS for now --- ActiveSync/iCalEvent+ActiveSync.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m index bbffb0292..95291eb11 100644 --- a/ActiveSync/iCalEvent+ActiveSync.m +++ b/ActiveSync/iCalEvent+ActiveSync.m @@ -361,14 +361,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [self setAccessClass: @"PUBLIC"]; } } - - if ((o = [theValues objectForKey: @"TimeZone"])) - { - // Ugh, we ignore it for now. - userTimeZone = [[[context activeUser] userDefaults] timeZone]; - tz = [iCalTimeZone timeZoneForName: [userTimeZone name]]; - [(iCalCalendar *) parent addTimeZone: tz]; - } + + // We ignore TimeZone sent by mobile devices for now. + // Some Windows devices don't send during event updates. + //if ((o = [theValues objectForKey: @"TimeZone"])) + // { + userTimeZone = [[[context activeUser] userDefaults] timeZone]; + tz = [iCalTimeZone timeZoneForName: [userTimeZone name]]; + [(iCalCalendar *) parent addTimeZone: tz]; + //} // FIXME: merge with iCalToDo if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))