Remove unused service repository dependency and update worker to suspend

Author: rfc2822

app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt

@@ -138,7 +138,6 @@ data class Collection(
     val supportsWebPush: Boolean = false,
 
     /** WebDAV-Push: VAPID public key */
-    // TODO: add non-unique index
     val pushVapidKey: String? = null,
 
     /** WebDAV-Push subscription URL */

app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationManager.kt

@@ -32,7 +32,6 @@ import at.bitfire.davdroid.repository.DavServiceRepository
 import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl
@@ -92,7 +91,7 @@ class PushRegistrationManager @Inject constructor(
         else
             UnifiedPush.unregister(context, serviceId.toString())
 
-        // UnifiedPush has now been called. It will do its work and then call back to UnifiedPushService, which
+        // UnifiedPush has now been called. It will do its work and then asynchronously call back to UnifiedPushService, which
         // will then call processSubscription or removeSubscription.
     }
 
@@ -158,13 +157,13 @@ class PushRegistrationManager @Inject constructor(
     /**
      * Called when no subscription is available (anymore) for the given service.
      *
-     * Unsubscribes from all collections.
+     * Unsubscribes from all subscribed collections.
      */
-    internal suspend fun removeSubscription(serviceId: Long) {
-        val service = serviceRepository.get(serviceId) ?: return
+    internal suspend fun removeSubscription(serviceId: Long) = withContext(dispatcher) {
+        val service = serviceRepository.get(serviceId) ?: return@withContext
         val unsubscribeFrom = collectionRepository.getPushRegistered(service.id)
         if (unsubscribeFrom.isEmpty())
-            return
+            return@withContext
 
         val account = accountRepository.get().fromName(service.accountName)
         httpClientBuilder.get()
@@ -268,10 +267,8 @@ class PushRegistrationManager @Inject constructor(
      *
      * Otherwise, a potentially existing worker is cancelled.
      */
-    fun updatePeriodicWorker() {
-        val workerNeeded = runBlocking {
-            collectionRepository.anyPushCapable()
-        }
+    suspend fun updatePeriodicWorker() = withContext(dispatcher) {
+        val workerNeeded = collectionRepository.anyPushCapable()
 
         val workManager = WorkManager.getInstance(context)
         if (workerNeeded) {
@@ -301,6 +298,9 @@ class PushRegistrationManager @Inject constructor(
         private const val WORKER_UNIQUE_NAME = "push-registration"
         const val WORKER_INTERVAL_DAYS = 1L
 
+        /**
+         * Single-thread dispatcher to synchronize tasks.
+         */
         val dispatcher = Dispatchers.IO.limitedParallelism(1)
 
     }

app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationWorker.kt

@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import at.bitfire.davdroid.repository.DavServiceRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import java.util.logging.Logger
@@ -24,8 +23,7 @@ class PushRegistrationWorker @AssistedInject constructor(
     @Assisted context: Context,
     @Assisted workerParameters: WorkerParameters,
     private val logger: Logger,
-    private val pushRegistrationManager: PushRegistrationManager,
-    private val serviceRepository: DavServiceRepository
+    private val pushRegistrationManager: PushRegistrationManager
 ) : CoroutineWorker(context, workerParameters) {
 
     override suspend fun doWork(): Result {

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

@@ -25,9 +25,6 @@ class PreferenceRepository @Inject constructor(
 
     companion object {
         const val LOG_TO_FILE = "log_to_file"
-        const val UNIFIED_PUSH_ENDPOINT_URL = "unified_push_endpoint_url"
-        const val UNIFIED_PUSH_ENDPOINT_KEY = "unified_push_endpoint_key"
-        const val UNIFIED_PUSH_ENDPOINT_AUTH = "unified_push_endpoint_auth"
     }
 
     private val preferences = PreferenceManager.getDefaultSharedPreferences(context)