Add comments

Author: rfc2822

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

@@ -50,7 +50,7 @@ import java.util.UUID
 /**
  * Mapper from Android event main + data rows to [VEvent].
  *
- * @param accountName       account name (used to generate self-attendee)
+ * @param accountName       account name (used to generate reminder email address)
  * @param prodIdGenerator   generates the `PRODID` to use
  */
 class AndroidEventProcessor(
@@ -210,7 +210,14 @@ class AndroidEventProcessor(
 
         val groupScheduled = main.subValues.any { it.uri == CalendarContract.Attendees.CONTENT_URI }
         if (groupScheduled) {
-            val weAreOrganizer = mainValues.getAsInteger(Events.IS_ORGANIZER) == 1
+            /* Note: Events.IS_ORGANIZER is defined in CalendarDatabaseHelper.java as
+            COALESCE(Events.IS_ORGANIZER, Events.ORGANIZER = Calendars.OWNER_ACCOUNT), so it's non-null when it's
+            - either explicitly set for an event,
+            - or the event's ORGANIZER is the same as the calendar's OWNER_ACCOUNT. */
+            val weAreOrganizer = when (mainValues.getAsInteger(Events.IS_ORGANIZER)) {
+                null, 0 -> false
+                /* explicitly set to non-zero, or 1 by provider calculation */ else -> true
+            }
 
             return if (weAreOrganizer) {
                 /* Upload of a group-scheduled event and we are the organizer, so we increase the SEQUENCE.

lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/processor/OrganizerProcessor.kt

@@ -22,14 +22,15 @@ class OrganizerProcessor: AndroidEventFieldProcessor {
         get() = Logger.getLogger(javaClass.name)
 
     override fun process(from: Entity, main: Entity, to: VEvent) {
-        // In case of an exception, we're taking ORGANIZER information from the main event and not the exception. See also RFC 6638 3.1.
-        val values = main.entityValues
+        // In case of an exception, we're taking ORGANIZER information from the main event and not the exception.
+        // See also RFC 6638 3.1 and 3.2.4.2.
+        val mainValues = main.entityValues
 
         // ORGANIZER must only be set for group-scheduled events (= events with attendees)
         val hasAttendees = from.subValues.any { it.uri == Attendees.CONTENT_URI }
-        if (hasAttendees && values.containsKey(Events.ORGANIZER))
+        if (hasAttendees && mainValues.containsKey(Events.ORGANIZER))
             try {
-                to.properties += Organizer(URI("mailto", values.getAsString(Events.ORGANIZER), null))
+                to.properties += Organizer(URI("mailto", mainValues.getAsString(Events.ORGANIZER), null))
             } catch (e: URISyntaxException) {
                 logger.log(Level.WARNING, "Error when creating ORGANIZER mailto URI, ignoring", e)
             }