Imports; AndroidEvent2: add attendees/extended properties

Author: rfc2822

README.md

@@ -21,11 +21,11 @@ Then make the changes in your own repository and send a pull request.
 
 # Packages
 
-- `at.bitfire.ical4android`: legacy [ical4android](https://github.com/bitfireAT/ical4android)
 - `at.bitfire.synctools`: new package where everything shall be refactored into
   - `.icalendar`: high-level operations on iCalendar objects
   - `.mapping`: mappers between low-level (database rows) and high-level (iCalendar/vCard) objects
   - `.storage`: low-level operations on content-provider storage (`ContentValues` / `Entity` to store data)
+- `at.bitfire.ical4android`: legacy [ical4android](https://github.com/bitfireAT/ical4android)
 - `at.bitfire.vcard4android`: legacy [vcard4android](https://github.com/bitfireAT/vcard4android)
 
 

lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt

@@ -94,7 +94,7 @@ class AndroidCalendar(
             for (row in entity.subValues)
                 batch += CpoBuilder.newInsert(row.uri)
                     .withValues(row.values)
-                    .withValueBackReference(DATA_ROW_EVENT_ID, /* result of first operation with index = */ 0)
+                    .withValueBackReference(AndroidEvent2.DATA_ROW_EVENT_ID, /* result of first operation with index = */ 0)
 
             batch.commit()
 
@@ -269,7 +269,7 @@ class AndroidCalendar(
             for (row in entity.subValues)
                 batch += CpoBuilder.newInsert(row.uri)
                     .withValues(ContentValues(row.values).apply {
-                        put(DATA_ROW_EVENT_ID, id)      // never update reference to main row ID
+                        put(AndroidEvent2.DATA_ROW_EVENT_ID, id)      // never update reference to main row ID
                     })
 
             batch.commit()
@@ -449,16 +449,4 @@ class AndroidCalendar(
         return Pair(protectedWhere, protectedWhereArgs)
     }
 
-
-    companion object {
-
-        /**
-         * Name of the data row field that references the main row ID.
-         *
-         * Equals to [Attendees.EVENT_ID], [Reminders.EVENT_ID] etc.
-         */
-        const val DATA_ROW_EVENT_ID = "event_id"
-
-    }
-
 }

lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidEvent2.kt

@@ -9,7 +9,9 @@ package at.bitfire.synctools.storage.calendar
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Entity
+import android.provider.CalendarContract.Attendees
 import android.provider.CalendarContract.Events
+import android.provider.CalendarContract.ExtendedProperties
 import android.provider.CalendarContract.Reminders
 import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.CATEGORIES_SEPARATOR
 
@@ -77,6 +79,16 @@ class AndroidEvent2(
 
     // data rows
 
+    val attendees: List<ContentValues>
+        get() = values.subValues.mapNotNull { dataRow ->
+            dataRow.values.takeIf { dataRow.uri == Attendees.CONTENT_URI }
+        }
+
+    val extendedProperties: List<ContentValues>
+        get() = values.subValues.mapNotNull { dataRow ->
+            dataRow.values.takeIf { dataRow.uri == ExtendedProperties.CONTENT_URI }
+        }
+
     val reminders: List<ContentValues>
         get() = values.subValues.mapNotNull { dataRow ->
             dataRow.values.takeIf { dataRow.uri == Reminders.CONTENT_URI }
@@ -145,6 +157,13 @@ class AndroidEvent2(
          */
         const val EXTNAME_URL = ContentResolver.CURSOR_ITEM_BASE_TYPE + "/vnd.ical4android.url"
 
+        /**
+         * Name of the data row field that references the main row ID.
+         *
+         * Equals to [Attendees.EVENT_ID], [Reminders.EVENT_ID] etc.
+         */
+        const val DATA_ROW_EVENT_ID = "event_id"
+
     }
 
 }