Use cancelSync directly in migration

Author: sunkup

app/src/main/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration21.kt

@@ -6,10 +6,10 @@ package at.bitfire.davdroid.settings.migration
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.content.ContentResolver
 import android.content.Context
 import android.os.Build
 import at.bitfire.davdroid.R
-import at.bitfire.davdroid.sync.adapter.SyncFrameworkIntegration
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -32,7 +32,6 @@ import javax.inject.Inject
  */
 class AccountSettingsMigration21 @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val syncFrameworkIntegration: SyncFrameworkIntegration,
     private val logger: Logger
 ): AccountSettingsMigration {
 
@@ -58,7 +57,7 @@ class AccountSettingsMigration21 @Inject constructor(
     private fun cancelSyncs(accountType: String) {
         accountManager.getAccountsByType(accountType).forEach { account ->
             logger.info("Android 14+: Canceling all (possibly forever pending) syncs for $account")
-            syncFrameworkIntegration.cancelSync(account, null)
+            ContentResolver.cancelSync(account, null)
         }
     }
 

app/src/main/kotlin/at/bitfire/davdroid/sync/adapter/SyncFrameworkIntegration.kt

@@ -120,17 +120,6 @@ class SyncFrameworkIntegration @Inject constructor(
         ContentResolver.cancelSync(syncRequest)
     }
 
-    /**
-     * Cancels all Sync Adapter Framework syncs (system wide) for given account and
-     * authority. If authority is null, all syncs for the given account
-     * regardless of authority are canceled.
-     *
-     * @param account The account for which syncs should be canceled.
-     * @param authority Null or the authority for which syncs should be canceled.
-     */
-    fun cancelSync(account: Account, authority: String?) =
-        ContentResolver.cancelSync(account, authority)
-
     /**
      * Enables/disables sync adapter automatic sync (content triggered sync) for the given
      * account and authority. Does *not* call [ContentResolver.setIsSyncable].