Generalize syncer

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/LocalTestCollection.kt

@@ -10,6 +10,8 @@ import at.bitfire.davdroid.resource.LocalCollection
 class LocalTestCollection: LocalCollection<LocalTestResource> {
 
     override val tag = "LocalTestCollection"
+    override val url: String
+        get() = "https://example.com"
     override val title = "Local Test Collection"
 
     override var lastSyncState: SyncState? = null
@@ -19,6 +21,8 @@ class LocalTestCollection: LocalCollection<LocalTestResource> {
     override val readOnly: Boolean
         get() = throw NotImplementedError()
 
+    override fun delete(): Boolean = true
+
     override fun findDeleted() = entries.filter { it.deleted }
     override fun findDirty() = entries.filter { it.dirty }
 

app/src/main/kotlin/at/bitfire/davdroid/repository/DavCollectionRepository.kt

@@ -6,6 +6,8 @@ package at.bitfire.davdroid.repository
 
 import android.accounts.Account
 import android.content.Context
+import android.provider.CalendarContract
+import android.provider.ContactsContract
 import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.XmlUtils
 import at.bitfire.dav4jvm.XmlUtils.insertTag
@@ -27,6 +29,7 @@ import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.servicedetection.RefreshCollectionsWorker
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.util.DavUtils
+import at.bitfire.ical4android.TaskProvider
 import at.bitfire.ical4android.util.DateUtils
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -184,6 +187,14 @@ class DavCollectionRepository @Inject constructor(
 
     fun getFlow(id: Long) = dao.getFlow(id)
 
+    fun getByServiceAndSync(serviceId: Long) = dao.getByServiceAndSync(serviceId)
+
+    fun getSyncCalendars(serviceId: Long) = dao.getSyncCalendars(serviceId)
+
+    fun getSyncJtxCollections(serviceId: Long) = dao.getSyncJtxCollections(serviceId)
+
+    fun getSyncTaskLists(serviceId: Long) = dao.getSyncTaskLists(serviceId)
+
     /** Returns all collections that are both selected for synchronization and push-capable. */
     suspend fun getSyncableAndPushCapable(): List<Collection> =
         dao.getPushCapableSyncCollections()
@@ -379,7 +390,6 @@ class DavCollectionRepository @Inject constructor(
         }
     }
 
-
     fun interface OnChangeListener {
         /**
          * Will be called when collections have changed. Will run in the coroutine context/thread

app/src/main/kotlin/at/bitfire/davdroid/repository/DavServiceRepository.kt

@@ -14,25 +14,35 @@ class DavServiceRepository @Inject constructor(
 
     private val dao = db.serviceDao()
 
-    fun get(id: Long): Service? = dao.get(id)
 
-    fun deleteAll() = dao.deleteAll()
+    // Read
 
-    suspend fun deleteByAccount(accountName: String) {
-        dao.deleteByAccount(accountName)
-    }
+    fun get(id: Long): Service? = dao.get(id)
+
+    fun getByAccountAndType(name: String, serviceType: String): Service? =
+        dao.getByAccountAndType(name, serviceType)
 
     fun getCalDavServiceFlow(accountName: String) =
         dao.getByAccountAndTypeFlow(accountName, Service.TYPE_CALDAV)
 
     fun getCardDavServiceFlow(accountName: String) =
         dao.getByAccountAndTypeFlow(accountName, Service.TYPE_CARDDAV)
 
+
+    // Create & update
+
     fun insertOrReplace(service: Service) =
         dao.insertOrReplace(service)
 
-    suspend fun renameAccount(oldName: String, newName: String) {
+    suspend fun renameAccount(oldName: String, newName: String) =
         dao.renameAccount(oldName, newName)
-    }
+
+
+    // Delete
+
+    fun deleteAll() = dao.deleteAll()
+
+    suspend fun deleteByAccount(accountName: String) =
+        dao.deleteByAccount(accountName)
 
 }

app/src/main/kotlin/at/bitfire/davdroid/repository/PrincipalRepository.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.repository
+
+import at.bitfire.davdroid.db.AppDatabase
+import at.bitfire.davdroid.db.Principal
+import javax.inject.Inject
+
+class PrincipalRepository @Inject constructor(
+    db: AppDatabase
+) {
+
+    private val dao = db.principalDao()
+
+    fun get(id: Long): Principal = dao.get(id)
+
+}

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalAddressBook.kt

@@ -218,7 +218,7 @@ open class LocalAddressBook @Inject constructor(
     fun requireMainAccount(): Account =
         mainAccount ?: throw IllegalArgumentException("No main account assigned to address book $account")
 
-    var url: String
+    override var url: String
         get() = AccountManager.get(context).getUserData(account, USER_DATA_URL)
                 ?: throw IllegalStateException("Address book has no URL")
         set(url) = AccountManager.get(context).setAndVerifyUserData(account, USER_DATA_URL, url)
@@ -304,9 +304,9 @@ open class LocalAddressBook @Inject constructor(
         updateSyncFrameworkSettings()
     }
 
-    fun delete() {
+    override fun delete(): Boolean {
         val accountManager = AccountManager.get(context)
-        accountManager.removeAccount(account, null, null, null)
+        return accountManager.removeAccountExplicitly(account)
     }
 
 

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalCalendar.kt

@@ -24,6 +24,11 @@ import java.util.LinkedList
 import java.util.logging.Level
 import java.util.logging.Logger
 
+/**
+ * Application-specific subclass of [AndroidCalendar] for local calendars.
+ *
+ * [Calendars.NAME] is used to store the calendar URL.
+ */
 class LocalCalendar private constructor(
     account: Account,
     provider: ContentProviderClient,
@@ -89,6 +94,9 @@ class LocalCalendar private constructor(
 
     }
 
+    override val url: String?
+        get() = name
+
     override val tag: String
         get() = "events-${account.name}-$id"
 

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalCollection.kt

@@ -9,9 +9,13 @@ import at.bitfire.davdroid.db.SyncState
 
 interface LocalCollection<out T: LocalResource<*>> {
 
-    /** a tag that uniquely identifies the collection (DAVx5-wide) */
+    /** A tag that uniquely identifies the collection (DAVx5-wide) */
     val tag: String
 
+    /** Address of the remote collection */
+    @Deprecated("Local collection should be identified by ID, not by URL")
+    val url: String?
+
     /** collection title (used for user notifications etc.) **/
     val title: String
 
@@ -23,6 +27,13 @@ interface LocalCollection<out T: LocalResource<*>> {
      */
     val readOnly: Boolean
 
+    /**
+     * Deletes the local collection.
+     *
+     * @return true if the collection was deleted, false otherwise
+     */
+    fun delete(): Boolean
+
     /**
      * Finds local resources of this collection which have been marked as *deleted* by the user
      * or an app acting on their behalf.

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalTaskList.kt

@@ -20,6 +20,11 @@ import org.dmfs.tasks.contract.TaskContract.*
 import java.util.logging.Level
 import java.util.logging.Logger
 
+/**
+ * App-specific implementation of a task list.
+ *
+ * [TaskLists._SYNC_ID] is used to store the task list URL.
+ */
 class LocalTaskList private constructor(
         account: Account,
         provider: TaskProvider,
@@ -77,6 +82,9 @@ class LocalTaskList private constructor(
             accessLevel != TaskListColumns.ACCESS_LEVEL_UNDEFINED &&
             accessLevel <= TaskListColumns.ACCESS_LEVEL_READ
 
+    override val url: String?
+        get() = syncId
+
     override val tag: String
         get() = "tasks-${account.name}-$id"