Filtered RDATE and EXDATE from exceptions

Author: ArnyminerZ

lib/src/main/kotlin/at/bitfire/ical4android/validation/EventValidator.kt

@@ -6,7 +6,6 @@ package at.bitfire.ical4android.validation
 
 import androidx.annotation.VisibleForTesting
 import at.bitfire.ical4android.Event
-import at.bitfire.ical4android.Ical4Android
 import at.bitfire.ical4android.util.DateUtils
 import at.bitfire.ical4android.util.TimeApiExtensions.toIcal4jDate
 import at.bitfire.ical4android.util.TimeApiExtensions.toLocalDate
@@ -47,7 +46,7 @@ object EventValidator {
         val dtStart = correctStartAndEndTime(event)
         sameTypeForDtStartAndRruleUntil(dtStart, event.rRules)
         removeRRulesWithUntilBeforeDtStart(dtStart, event.rRules)
-        removeRRulesOfExceptions(event.exceptions)
+        removeRecurrenceOfExceptions(event.exceptions)
     }
 
 
@@ -169,15 +168,19 @@ object EventValidator {
 
 
     /**
-     * Removes RRULEs of exceptions of (potentially recurring) events
+     * Removes all recurrence information of exceptions of (potentially recurring) events. This is:
+     * `RRULE`, `RDATE` and `EXDATE`.
      * Note: This repair step needs to be applied after all exceptions have been found
      *
      * @param exceptions exceptions of an event
      */
     @VisibleForTesting
-    internal fun removeRRulesOfExceptions(exceptions: List<Event>) {
-        for (exception in exceptions)
+    internal fun removeRecurrenceOfExceptions(exceptions: List<Event>) {
+        for (exception in exceptions) {
             exception.rRules.clear()     // Drop all RRULEs for the exception
+            exception.rDates.clear()     // Drop all RDATEs for the exception
+            exception.exDates.clear()    // Drop all EXDATEs for the exception
+        }
     }
 
 

lib/src/test/kotlin/at/bitfire/ical4android/validation/EventValidatorTest.kt

@@ -7,14 +7,23 @@ package at.bitfire.ical4android.validation
 import at.bitfire.ical4android.Event
 import at.bitfire.ical4android.util.DateUtils
 import net.fortuna.ical4j.model.Date
+import net.fortuna.ical4j.model.DateList
 import net.fortuna.ical4j.model.DateTime
+import net.fortuna.ical4j.model.Property
+import net.fortuna.ical4j.model.PropertyList
 import net.fortuna.ical4j.model.Recur
+import net.fortuna.ical4j.model.TimeZone
 import net.fortuna.ical4j.model.TimeZoneRegistry
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory
+import net.fortuna.ical4j.model.component.VTimeZone
+import net.fortuna.ical4j.model.parameter.Value
 import net.fortuna.ical4j.model.property.DtEnd
 import net.fortuna.ical4j.model.property.DtStart
+import net.fortuna.ical4j.model.property.ExDate
+import net.fortuna.ical4j.model.property.RDate
 import net.fortuna.ical4j.model.property.RRule
 import net.fortuna.ical4j.model.property.RecurrenceId
+import net.fortuna.ical4j.model.property.TzId
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -394,14 +403,48 @@ class EventValidatorTest {
                         .interval(2)
                         .build())
                 ))
+                rDates.addAll(listOf(
+                    RDate(DateList(Value("19970714T123000Z"))),
+                    RDate(
+                        DateList(
+                            Value("19960403T020000Z"),
+                            TimeZone(
+                                VTimeZone(
+                                    PropertyList<Property>(1).apply {
+                                        add(TzId("US-EASTERN"))
+                                    }
+                                )
+                            )
+                        )
+                    )
+                ))
+                exDates.addAll(listOf(
+                    ExDate(DateList(Value("19970714T123000Z"))),
+                    ExDate(
+                        DateList(
+                            Value("19960403T020000Z"),
+                            TimeZone(
+                                VTimeZone(
+                                    PropertyList<Property>(1).apply {
+                                        add(TzId("US-EASTERN"))
+                                    }
+                                )
+                            )
+                        )
+                    )
+                ))
                 uid = "76c08fb1-99a3-41cf-b482-2d3b06648814"
             })
         }
         assertTrue(manualEvent.rRules.size == 1)
-        assertTrue(manualEvent.exceptions.first.rRules.size == 2)
-        EventValidator.removeRRulesOfExceptions(manualEvent.exceptions) // Repair the manually created event
+        assertTrue(manualEvent.exceptions.first().rRules.size == 2)
+        assertTrue(manualEvent.exceptions.first().rDates.size == 2)
+        assertTrue(manualEvent.exceptions.first().exDates.size == 2)
+        EventValidator.removeRecurrenceOfExceptions(manualEvent.exceptions) // Repair the manually created event
         assertTrue(manualEvent.rRules.size == 1)
-        assertTrue(manualEvent.exceptions.first.rRules.isEmpty())
+        assertTrue(manualEvent.exceptions.first().rRules.isEmpty())
+        assertTrue(manualEvent.exceptions.first().rDates.isEmpty())
+        assertTrue(manualEvent.exceptions.first().exDates.isEmpty())
 
         // Test event from reader, the reader will repair the event itself
         val eventFromReader = Event.eventsFromReader(StringReader(
@@ -422,14 +465,16 @@ class EventValidatorTest {
                 "SUMMARY:exception of recurring event\n" +
                 "RRULE:FREQ=DAILY;COUNT=6;INTERVAL=2\n" +           // but remove this one
                 "RRULE:FREQ=DAILY;COUNT=6;INTERVAL=2\n" +           // and this one
+                "EXDATE;TZID=Europe/Paris:20240704T193000\n" +      // also this
+                "RDATE;TZID=US-EASTERN:19970714T083000\n" +         // and this
                 "DTSTART;TZID=Europe/Paris:20240221T110000\n" +
                 "DTEND;TZID=Europe/Paris:20240221T120000\n" +
                 "UID:76c08fb1-99a3-41cf-b482-2d3b06648814\n" +
                 "END:VEVENT\n" +
                 "END:VCALENDAR"
         )).first()
         assertTrue(eventFromReader.rRules.size == 1)
-        assertTrue(eventFromReader.exceptions.first.rRules.isEmpty())
+        assertTrue(eventFromReader.exceptions.first().rRules.isEmpty())
     }
 
     @Test