fix(calendar): adjust recurrent rule when importing a vEvent

Alinto · Jan 20, 2020 · 560c1dc · 560c1dc
1 parent 0e5514e
commit 560c1dc
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -536,6 +536,23 @@ - (iCalTimeZone *) adjustInContext: (WOContext *) context
       [self errorWithFormat: @"Broken all-day event; setting end date to %@ for UID %@", [self endDate], [self uid]];
     }
 
+  if ([self isRecurrent])
+    {
+      NSArray *rules;
+      iCalRecurrenceRule *rule;
+
+      rules = [self recurrenceRules];
+      if ([rules count] > 0)
+        {
+          // Consider first rule only
+          rule = [rules objectAtIndex: 0];
+          if ([rule repeatCount] && [rule untilDate])
+            {
+              [self errorWithFormat: @"Recurrent event with both repeat count (%i) and until date (%@); dropping until date", [rule repeatCount], [rule untilDate]];
+              [rule setUntil: nil];
+            }
+        }
+    }
 
   return timezone;