Comments

Author: rfc2822

lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/DurationHandler.kt

@@ -35,15 +35,14 @@ class DurationHandler(
     override fun process(from: Entity, main: Entity, to: VEvent) {
         val values = from.entityValues
 
-        /* Skip if:
-        - DTEND is set – we don't need to process DURATION anymore.
-        - DURATION is not set – then usually DTEND is set; however it's also OK to have neither DTEND nor DURATION in a VEVENT. */
+        /* Skip if DTEND is set and/or DURATION is not set. In both cases EndTimeHandler is
+        responsible for generating the DTEND property. */
         if (values.getAsLong(Events.DTEND) != null)
             return
         val durationStr = values.getAsString(Events.DURATION) ?: return
-        val parsedDuration = AndroidTimeUtils.parseDuration(durationStr)
 
-        // invert in case of negative duration (events can't go back in time)
+        // parse duration and invert in case of negative value (events can't go back in time)
+        val parsedDuration = AndroidTimeUtils.parseDuration(durationStr)
         val duration = parsedDuration.abs()
 
         /* Some servers have problems with DURATION. For maximum compatibility, we always generate DTEND instead of DURATION.

lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/EndTimeHandler.kt

@@ -42,13 +42,14 @@ class EndTimeHandler(
         val durationStr = values.getAsString(Events.DURATION)
 
         if (tsEndOrNull == null && durationStr != null) // DTEND not present, but DURATION is present:
-            return                                      // DurationHandler is responsible
+            return                                      // DurationHandler is responsible for generating the DTEND property
 
         /* Make sure that there's always a DTEND for compatibility. While it's allowed in RFC 5545
-        to omit DTEND, this causes problems with some servers (notably iCloud). */
+        to omit DTEND, this causes problems with some servers (notably iCloud). See also:
+        https://github.com/bitfireAT/davx5-ose/issues/1859 */
         val tsEnd = tsEndOrNull
             ?.takeUnless { it < tsStart }               // only use DTEND if it's not before DTSTART
-            ?: calculateFromDefault(tsStart, allDay)    // for compatibility
+            ?: calculateFromDefault(tsStart, allDay)    // always provide DTEND for compatibility
 
         // DATE or DATE-TIME according to allDay
         val end = AndroidTimeField(