From dc2878b5e2a705ace7347fec7efbf4075daf2977 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sat, 16 Jan 2016 08:08:37 -0500 Subject: [PATCH] (fix) don't generate dual Body tag for event exceptions --- ActiveSync/iCalEvent+ActiveSync.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m index cb599f239..7cf25d0ef 100644 --- a/ActiveSync/iCalEvent+ActiveSync.m +++ b/ActiveSync/iCalEvent+ActiveSync.m @@ -137,14 +137,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. if (!tz) tz = [iCalTimeZone timeZoneForName: [userTimeZone name]]; - [s appendFormat: @"%@", [tz activeSyncRepresentationInContext: context]]; + if (![self recurrenceId]) + [s appendFormat: @"%@", [tz activeSyncRepresentationInContext: context]]; // Organizer and other invitations related properties if ((organizer = [self organizer])) { meetingStatus = 1; // meeting and the user is the meeting organizer. o = [organizer rfc822Email]; - if ([o length]) + if (![self recurrenceId] && [o length]) { [s appendFormat: @"%@", o]; @@ -349,7 +350,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details. o = [o activeSyncRepresentationInContext: context]; - if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"]) + if ([self recurrenceId] || [[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"]) { [s appendFormat: @"%@", o]; [s appendString: @"0"];