AndroidCalendar: add methods

Author: rfc2822

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

@@ -6,11 +6,14 @@
 
 package at.bitfire.synctools.storage.calendar
 
+import android.content.ContentUris
 import android.content.ContentValues
+import android.os.RemoteException
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Calendars
 import at.bitfire.ical4android.AndroidEvent
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
+import at.bitfire.synctools.storage.LocalStorageException
 import toContentValues
 import java.util.LinkedList
 
@@ -59,17 +62,63 @@ class AndroidCalendar(
      * @return events from this calendar which match the selection
      */
     fun findEvents(where: String?, whereArgs: Array<String>?): List<AndroidEvent> {
-        val whereWithId = "(${where ?: "1"}) AND " + CalendarContract.Events.CALENDAR_ID + "=?"
-        val whereArgsWithId = (whereArgs ?: arrayOf()) + id.toString()
-
         val events = LinkedList<AndroidEvent>()
-        client.query(eventsUri, null, whereWithId, whereArgsWithId, null)?.use { cursor ->
-            while (cursor.moveToNext())
-                events += AndroidEvent(this, cursor.toContentValues())
+        try {
+            val (protectedWhere, protectedWhereArgs) = whereWithCalendarId(where, whereArgs)
+            client.query(eventsUri, null, protectedWhere, protectedWhereArgs, null)?.use { cursor ->
+                while (cursor.moveToNext())
+                    events += AndroidEvent(this, cursor.toContentValues())
+            }
+        } catch (e: RemoteException) {
+            throw LocalStorageException("Couldn't query events", e)
         }
         return events
     }
 
+    fun getEventValues(id: Long, projection: Array<String>? = null, where: String? = null, whereArgs: Array<String>? = null): ContentValues? {
+        try {
+            client.query(eventUri(id), projection, where, whereArgs, null)?.use { cursor ->
+                if (cursor.moveToNext())
+                    return cursor.toContentValues()
+            }
+        } catch (e: RemoteException) {
+            throw LocalStorageException("Couldn't query event", e)
+        }
+        return null
+    }
+
+    /**
+     * Iterates events from this calendar.
+     *
+     * Adds a WHERE clause that restricts the query to [CalendarContract.EventsColumns.CALENDAR_ID] = [id].
+     *
+     * @param projection    requested fields
+     * @param where         selection
+     * @param whereArgs     arguments for selection
+     *
+     * @return event IDs from this calendar which match the selection
+     */
+    fun iterateEvents(projection: Array<String>, where: String?, whereArgs: Array<String>?, body: (ContentValues) -> Unit) {
+        try {
+            val (protectedWhere, protectedWhereArgs) = whereWithCalendarId(where, whereArgs)
+            client.query(eventsUri, projection, protectedWhere, protectedWhereArgs, null)?.use { cursor ->
+                while (cursor.moveToNext()) {
+                    body(cursor.toContentValues())
+                }
+            }
+        } catch (e: RemoteException) {
+            throw LocalStorageException("Couldn't iterate events", e)
+        }
+    }
+
+    fun updateEvents(values: ContentValues, where: String?, whereArgs: Array<String>?) {
+        try {
+            client.update(eventsUri, values, where, whereArgs)
+        } catch (e: RemoteException) {
+            throw LocalStorageException("Couldn't update events", e)
+        }
+    }
+
 
     // shortcuts to upper level
 
@@ -87,4 +136,13 @@ class AndroidCalendar(
     val eventsUri
         get() = CalendarContract.Events.CONTENT_URI.asSyncAdapter(account)
 
+    fun eventUri(id: Long) =
+        ContentUris.withAppendedId(eventsUri, id)
+
+    private fun whereWithCalendarId(where: String?, whereArgs: Array<String>?): Pair<String, Array<String>> {
+        val protectedWhere = "(${where ?: "1"}) AND " + CalendarContract.Events.CALENDAR_ID + "=?"
+        val protectedWhereArgs = (whereArgs ?: arrayOf()) + id.toString()
+        return Pair(protectedWhere, protectedWhereArgs)
+    }
+
 }

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

@@ -59,7 +59,7 @@ class AndroidCalendarProvider(
         return getCalendar(id) ?: throw LocalStorageException("Couldn't query calendar that was just created")
     }
 
-    fun findCalendars(where: String?, whereArgs: Array<String>?, sortOrder: String? = null): List<AndroidCalendar> {
+    fun findCalendars(where: String? = null, whereArgs: Array<String>? = null, sortOrder: String? = null): List<AndroidCalendar> {
         val result = LinkedList<AndroidCalendar>()
         try {
             client.query(calendarsUri, null, where, whereArgs, sortOrder)?.use { cursor ->
@@ -196,9 +196,7 @@ class AndroidCalendarProvider(
         get() = Calendars.CONTENT_URI.asSyncAdapter(account)
 
     private fun calendarUri(id: Long) =
-        ContentUris
-            .withAppendedId(Calendars.CONTENT_URI, id)
-            .asSyncAdapter(account)
+        ContentUris.withAppendedId(calendarsUri, id)
 
     private val colorsUri
         get() = Colors.CONTENT_URI.asSyncAdapter(account)