LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(mail): fix end date of all-day event in mail notifications 

Fixes #5384
pull/273/merge
Francis Lachapelle 2021-09-07 16:51:11 -04:00
parent ea6b699094
commit ef5820b49b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SoObjects/Appointments/SOGoAptMailUpdate.m
View File

@ -87,11 +87,17 @@
value = [(iCalEvent *) apt propertyValue: property]; value = [(iCalEvent *) apt propertyValue: property];
if ([valueType isEqualToString: @"date"]) if ([valueType isEqualToString: @"date"])
{ {
[value setTimeZone: viewTZ]; if ([(iCalEvent *) apt isAllDay])
if ([apt isAllDay]) {
value = [_dateFormatter formattedDate: value]; if ([property isEqualToString: @"endDate"])
value = [(NSCalendarDate *) value dateByAddingYears:0 months:0 days:0 hours:0 minutes:0 seconds:-1];
value = [_dateFormatter formattedDate: value];
}
else else
value = [_dateFormatter formattedDateAndTime: value]; {
[value setTimeZone: viewTZ];
value = [_dateFormatter formattedDateAndTime: value];
}
} }
} }
else else
@ -106,8 +112,8 @@
NSArray *updatedProperties; NSArray *updatedProperties;
int count, max; int count, max;
updatedProperties = [[iCalEventChanges changesFromEvent: previousApt updatedProperties = [[iCalEventChanges changesFromEvent: (iCalEvent *) previousApt
toEvent: apt] toEvent: (iCalEvent *) apt]
updatedProperties]; updatedProperties];
max = [updatedProperties count]; max = [updatedProperties count];
for (count = 0; count < max; count++) for (count = 0; count < max; count++)
@ -170,7 +176,7 @@
[values setObject: [localDateFormatter shortFormattedDate: date] [values setObject: [localDateFormatter shortFormattedDate: date]
forKey: @"OldStartDate"]; forKey: @"OldStartDate"];
if (![apt isAllDay]) if (![(iCalEvent *) apt isAllDay])
[values setObject: [localDateFormatter formattedTime: date] [values setObject: [localDateFormatter formattedTime: date]
forKey: @"OldStartTime"]; forKey: @"OldStartTime"];