Collections: unified delete() return value

bitfireAT · Aug 1, 2024 · 86af14d · 86af14d
1 parent a36ee48
commit 86af14d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt
@@ -194,9 +194,14 @@ abstract class AndroidCalendar<out T: AndroidEvent>(
         return provider.update(calendarSyncURI(), info, null, null)
     }
 
-    fun delete(): Int {
+    /**
+     * Deletes this calendar from the local calendar provider.
+     *
+     * @return `true` if the calendar was deleted, `false` otherwise (like it was not there before the call)
+     */
+    fun delete(): Boolean {
         logger.log(Level.FINE, "Deleting local calendar (#$id)")
-        return provider.delete(calendarSyncURI(), null, null)
+        return provider.delete(calendarSyncURI(), null, null) > 0
     }
 
 

diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/DmfsTaskList.kt b/lib/src/main/kotlin/at/bitfire/ical4android/DmfsTaskList.kt
@@ -126,9 +126,14 @@ abstract class DmfsTaskList<out T : DmfsTask>(
         return provider.client.update(taskListSyncUri(), info, null, null)
     }
 
-    fun delete(): Int {
+    /**
+     * Deletes this calendar from the local calendar provider.
+     *
+     * @return `true` if the calendar was deleted, `false` otherwise (like it was not there before the call)
+     */
+    fun delete(): Boolean {
         logger.log(Level.FINE, "Deleting ${provider.name.authority} task list (#$id)")
-        return provider.client.delete(taskListSyncUri(), null, null)
+        return provider.client.delete(taskListSyncUri(), null, null) > 0
     }
 
     /**

diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt b/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt
@@ -29,7 +29,7 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
     companion object {
 
         private val logger
-            get() = Logger.getLogger(javaClass.name)
+            get() = Logger.getLogger(JtxCollection::class.java.name)
 
         fun create(account: Account, client: ContentProviderClient, values: ContentValues): Uri {
             logger.log(Level.FINE, "Creating jtx Board collection", values)
@@ -63,9 +63,9 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
     var context: Context? = null
 
 
-    fun delete() {
+    fun delete(): Boolean {
         logger.log(Level.FINE, "Deleting jtx Board collection (#$id)")
-        client.delete(ContentUris.withAppendedId(JtxContract.JtxCollection.CONTENT_URI.asSyncAdapter(account), id), null, null)
+        return client.delete(ContentUris.withAppendedId(JtxContract.JtxCollection.CONTENT_URI.asSyncAdapter(account), id), null, null) > 0
     }
 
     fun update(values: ContentValues) {