Initial support for multiple alarms and better iCal compatibility

This commit is contained in:
Ludovic Marcotte committed 2014-09-12 14:09:28 -04:00
1 parent 12a4fd05a2
commit b8b3519a40
7 files changed
+69 -23

No files matched your search

+5 -7
View File
@@ -517,21 +517,19 @@
startDate: &eventStartDate
endDate: &eventEndDate];
anAlarm = [event firstDisplayOrAudioAlarm];
if (resetAlarm)
{
iCalTrigger *aTrigger;
anAlarm = [[event alarms] objectAtIndex: 0];
aTrigger = [anAlarm trigger];
[aTrigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
[aTrigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
[co saveComponent: master];
}
else if (snoozeAlarm)
{
anAlarm = [[event alarms] objectAtIndex: 0];
if ([[anAlarm action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
[co snoozeAlarm: snoozeAlarm];
[co snoozeAlarm: snoozeAlarm];
}
}
+6 -6
View File
@@ -534,16 +534,16 @@ iRANGE(2);
if ([component hasAlarms])
{
// We currently have the following limitations for alarms:
// - only the first alarm is considered;
// - the alarm's action must be of type DISPLAY;
// - the alarm's action must be of type DISPLAY or AUDIO (considered as DISPLAY)
// - the alarm's trigger value type must be DURATION.
anAlarm = [[component alarms] objectAtIndex: 0];
anAlarm = [component firstSupportedAlarm];
aTrigger = [anAlarm trigger];
ASSIGN (reminderAction, [[anAlarm action] lowercaseString]);
if (([reminderAction isEqualToString: @"display"]
|| [reminderAction isEqualToString: @"email"])
&& [[aTrigger valueType] caseInsensitiveCompare: @"DURATION"] == NSOrderedSame)
// The default value type is DURATION. See http://tools.ietf.org/html/rfc5545#section-3.8.6.3
if (![[aTrigger valueType] length] ||
[[aTrigger valueType] caseInsensitiveCompare: @"DURATION"] == NSOrderedSame)
{
duration = [aTrigger flattenedValuesForKey: @""];
i = [reminderValues indexOfObject: duration];
+4 -4
View File
@@ -459,11 +459,13 @@
timezone: timeZone
startDate: &startDate
endDate: &dueDate];
anAlarm = [todo firstDisplayOrAudioAlarm];
if (resetAlarm)
{
iCalTrigger *aTrigger;
anAlarm = [[todo alarms] objectAtIndex: 0];
aTrigger = [anAlarm trigger];
[aTrigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
@@ -471,9 +473,7 @@
}
else if (snoozeAlarm)
{
anAlarm = [[todo alarms] objectAtIndex: 0];
if ([[anAlarm action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
[co snoozeAlarm: snoozeAlarm];
[co snoozeAlarm: snoozeAlarm];
}
}
resetAlarm = [[[context request] formValueForKey: @"resetAlarm"] boolValue];