From 01857a9a47ae11561ab844a8759478f48ee607d3 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 2 Apr 2015 11:53:03 -0400 Subject: [PATCH] [fix] Timezone of MS Exchange freebusy information --- NEWS | 3 ++- .../MSExchangeFreeBusySOAPRequest.m | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 2a552a6f7..6c559e539 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,8 @@ Bug fixes - now keep the BodyPreference for future EAS use and default to MIME if none set (#3146) - EAS reply fix when message/rfc822 parts are included in the original mail (#3153) - fixed yet an other potential crash during freebusy lookups during timezone changes - - fix display of freebusy information in event attendees editor during timezone changes + - fixed display of freebusy information in event attendees editor during timezone changes + - fixed timezone of MSExchange freebusy information - fixed a potential EAS error with multiple email priority flags 2.2.17a (2015-03-15) diff --git a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m index 01c9e8aea..425178b36 100644 --- a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m +++ b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m @@ -70,11 +70,27 @@ to: (NSCalendarDate *) newEndDate { ASSIGN(address, newAddress); - ASSIGN(startDate, newStartDate); - ASSIGN(endDate, newEndDate); + + startDate = [NSCalendarDate dateWithYear: [newStartDate yearOfCommonEra] + month: [newStartDate monthOfYear] + day: [newStartDate dayOfMonth] + hour: [newStartDate hourOfDay] + minute: [newStartDate minuteOfHour] + second: [newStartDate secondOfMinute] + timeZone: [newStartDate timeZone]]; + endDate = [NSCalendarDate dateWithYear: [newEndDate yearOfCommonEra] + month: [newEndDate monthOfYear] + day: [newEndDate dayOfMonth] + hour: [newEndDate hourOfDay] + minute: [newEndDate minuteOfHour] + second: [newEndDate secondOfMinute] + timeZone: [newEndDate timeZone]]; [startDate setTimeZone: timeZone]; [endDate setTimeZone: timeZone]; + + [startDate retain]; + [endDate retain]; } - (NSString *) serverVersion