Minor changes

- add worker thread annotations
- use injected defaultDispatcher

Author: sunkup

app/src/main/kotlin/at/bitfire/davdroid/App.kt

@@ -7,13 +7,14 @@ package at.bitfire.davdroid
 import android.app.Application
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
+import at.bitfire.davdroid.di.DefaultDispatcher
 import at.bitfire.davdroid.log.LogManager
 import at.bitfire.davdroid.startup.StartupPlugin
 import at.bitfire.davdroid.sync.account.AccountsCleanupWorker
 import at.bitfire.davdroid.ui.UiUtils
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.util.logging.Logger
@@ -31,6 +32,10 @@ class App: Application(), Configuration.Provider {
     @Inject
     lateinit var logManager: LogManager
 
+    @Inject
+    @DefaultDispatcher
+    lateinit var defaultDispatcher: CoroutineDispatcher
+
     @Inject
     lateinit var plugins: Set<@JvmSuppressWildcards StartupPlugin>
 
@@ -60,7 +65,7 @@ class App: Application(), Configuration.Provider {
 
         // don't block UI for some background checks
         @OptIn(DelicateCoroutinesApi::class)
-        GlobalScope.launch(Dispatchers.Default) {
+        GlobalScope.launch(defaultDispatcher) {
             // clean up orphaned accounts in DB from time to time
             AccountsCleanupWorker.enable(this@App)
 

app/src/main/kotlin/at/bitfire/davdroid/sync/AutomaticSyncManager.kt

@@ -7,6 +7,7 @@ package at.bitfire.davdroid.sync
 import android.accounts.Account
 import android.provider.CalendarContract
 import android.provider.ContactsContract
+import androidx.annotation.WorkerThread
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.repository.DavServiceRepository
 import at.bitfire.davdroid.resource.LocalAddressBookStore
@@ -59,6 +60,7 @@ class AutomaticSyncManager @Inject constructor(
      * @param account   the account to synchronize
      * @param dataType  the data type to synchronize
      */
+    @WorkerThread
     private fun enableAutomaticSync(
         account: Account,
         dataType: SyncDataType
@@ -113,6 +115,7 @@ class AutomaticSyncManager @Inject constructor(
      *
      * @param account   account for which automatic synchronization shall be updated
      */
+    @WorkerThread
     fun updateAutomaticSync(account: Account) {
         for (dataType in SyncDataType.entries)
             updateAutomaticSync(account, dataType)
@@ -128,6 +131,7 @@ class AutomaticSyncManager @Inject constructor(
      * @param account   account for which automatic synchronization shall be updated
      * @param dataType  sync data type for which automatic synchronization shall be updated
      */
+    @WorkerThread
     fun updateAutomaticSync(account: Account, dataType: SyncDataType) {
         val serviceType = when (dataType) {
             SyncDataType.CONTACTS -> Service.TYPE_CARDDAV

app/src/main/kotlin/at/bitfire/davdroid/sync/TasksAppManager.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.drawable.BitmapDrawable
+import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.net.toUri
@@ -77,6 +78,7 @@ class TasksAppManager @Inject constructor(
     /**
      * Sets up sync for the selected TaskProvider.
      */
+    @WorkerThread
     fun selectProvider(selectedProvider: ProviderName?) {
         logger.info("Selecting tasks app: $selectedProvider")
 

app/src/main/kotlin/at/bitfire/davdroid/ui/TasksModel.kt

@@ -11,20 +11,22 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import at.bitfire.davdroid.di.DefaultDispatcher
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.sync.TasksAppManager
 import at.bitfire.davdroid.util.packageChangedFlow
 import at.bitfire.ical4android.TaskProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class TasksModel @Inject constructor(
     @ApplicationContext val context: Context,
+    @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher,
     private val settings: SettingsManager,
     private val tasksAppManager: TasksAppManager
 ) : ViewModel() {
@@ -75,7 +77,7 @@ class TasksModel @Inject constructor(
             false
         }
 
-    fun selectProvider(provider: TaskProvider.ProviderName) = viewModelScope.launch(Dispatchers.Default) {
+    fun selectProvider(provider: TaskProvider.ProviderName) = viewModelScope.launch(defaultDispatcher) {
         tasksAppManager.selectProvider(provider)
     }
 

app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt

@@ -11,6 +11,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import at.bitfire.davdroid.di.DefaultDispatcher
 import at.bitfire.davdroid.repository.AccountRepository
 import at.bitfire.davdroid.servicedetection.DavResourceFinder
 import at.bitfire.davdroid.settings.AccountSettings
@@ -21,6 +22,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -41,6 +43,7 @@ class LoginScreenModel @AssistedInject constructor(
     @Assisted val initialLoginInfo: LoginInfo,
     private val accountRepository: AccountRepository,
     @ApplicationContext val context: Context,
+    @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher,
     private val logger: Logger,
     val loginTypesProvider: LoginTypesProvider,
     private val resourceFinderFactory: DavResourceFinder.Factory,
@@ -299,7 +302,7 @@ class LoginScreenModel @AssistedInject constructor(
         }
 
         viewModelScope.launch {
-            val account = withContext(Dispatchers.Default) {
+            val account = withContext(defaultDispatcher) {
                 accountRepository.createBlocking(
                     accountDetailsUiState.value.accountName,
                     loginInfo.credentials,