fix(calendar): ensure alarms have a DESCRIPTION property

Alinto · Jan 6, 2022 · b817048 · b817048
1 parent cabba35
commit b817048
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/SoObjects/Appointments/iCalAlarm+SOGo.m b/SoObjects/Appointments/iCalAlarm+SOGo.m
@@ -1,6 +1,6 @@
 /* iCalAlarm+SOGo.m - this file is part of SOGo
  *
- * Copyright (C) 2015-2017 Inverse inc.
+ * Copyright (C) 2015-2022 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,6 +89,13 @@ + (id) alarmForEvent: (iCalEntityObject *) theEntity
   if ([reminderAction length] > 0 && [reminderUnit length] > 0)
     {
       [anAlarm setAction: [reminderAction uppercaseString]];
+      [anAlarm setSummary: [theEntity summary]];
+      if ([[theEntity comment] length])
+        [anAlarm setComment: [theEntity comment]];
+      else
+        // RFC 5545 requires the DESCRIPTION (comment) field to be defined for a VALARM
+        [anAlarm setComment: [theEntity summary]];
+
       if ([reminderAction isEqualToString: @"email"])
         {
           [anAlarm removeAllAttendees];
@@ -97,8 +104,6 @@ + (id) alarmForEvent: (iCalEntityObject *) theEntity
                          toEmailAlarm: anAlarm];
           if (reminderEmailOrganizer)
             [anAlarm _appendOrganizerToEmailAlarm: anAlarm  owner: theOwner];
-          [anAlarm setSummary: [theEntity summary]];
-          [anAlarm setComment: [theEntity comment]];
         }
 
       if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)