Initiate sync requests on background thread

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt

@@ -145,15 +145,12 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
     private lateinit var callbacks: TaskListFragmentCallbackHandler
 
     override fun onRefresh() {
+        syncAdapters.sync(true)
         lifecycleScope.launch {
-            if (syncAdapters.sync(true)) {
             delay(1000)
-                setSyncOngoing()
-            } else {
             refresh()
         }
     }
-    }
 
     private fun setSyncOngoing() {
         AndroidUtilities.assertMainThread()
@@ -492,9 +489,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
         for (task in tasks) {
             onTaskCreated(task.uuid)
         }
-        lifecycleScope.launch {
         syncAdapters.sync()
-        }
         loadTaskListContent()
     }
 

app/src/main/java/org/tasks/preferences/MainPreferences.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import org.tasks.R
 import org.tasks.drive.DriveLoginActivity
@@ -32,15 +31,15 @@ class MainPreferences : BasePreferences() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CALDAV_SETTINGS) {
             if (resultCode == RESULT_OK) {
-                lifecycleScope.launch(NonCancellable) {
                 syncAdapters.sync(true)
+                lifecycleScope.launch {
                     workManager.updateBackgroundSync()
                 }
             }
         } else if (requestCode == REQUEST_GOOGLE_TASKS) {
             if (resultCode == Activity.RESULT_OK) {
-                lifecycleScope.launch(NonCancellable) {
                 syncAdapters.sync(true)
+                lifecycleScope.launch {
                     workManager.updateBackgroundSync()
                 }
             } else {

app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt

@@ -94,8 +94,8 @@ class Synchronization : InjectingPreferenceFragment() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CALDAV_SETTINGS) {
             if (resultCode == Activity.RESULT_OK) {
-                lifecycleScope.launch(NonCancellable) {
                 syncAdapters.sync(true)
+                lifecycleScope.launch {
                     workManager.updateBackgroundSync()
                 }
             }

app/src/main/java/org/tasks/sync/SyncAdapters.kt

@@ -2,8 +2,7 @@ package org.tasks.sync
 
 import com.todoroo.astrid.data.SyncFlags
 import com.todoroo.astrid.data.Task
-import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.*
-import kotlinx.coroutines.withContext
 import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV
 import org.tasks.data.CaldavAccount.Companion.TYPE_ETESYNC
 import org.tasks.data.CaldavDao
@@ -14,6 +13,7 @@ import org.tasks.jobs.WorkManager
 import org.tasks.jobs.WorkManager.Companion.TAG_SYNC_CALDAV
 import org.tasks.jobs.WorkManager.Companion.TAG_SYNC_ETESYNC
 import org.tasks.jobs.WorkManager.Companion.TAG_SYNC_GOOGLE_TASKS
+import java.util.concurrent.Executors.newSingleThreadExecutor
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -23,13 +23,14 @@ class SyncAdapters @Inject constructor(
         private val caldavDao: CaldavDao,
         private val googleTaskDao: GoogleTaskDao,
         private val googleTaskListDao: GoogleTaskListDao) {
+    private val scope = CoroutineScope(newSingleThreadExecutor().asCoroutineDispatcher() + SupervisorJob())
     private val googleTasks = Debouncer(TAG_SYNC_GOOGLE_TASKS) { workManager.googleTaskSync(it) }
     private val caldav = Debouncer(TAG_SYNC_CALDAV) { workManager.caldavSync(it) }
     private val eteSync = Debouncer(TAG_SYNC_ETESYNC) { workManager.eteSync(it) }
 
-    suspend fun sync(task: Task, original: Task?) {
+    fun sync(task: Task, original: Task?) = scope.launch {
         if (task.checkTransitory(SyncFlags.SUPPRESS_SYNC)) {
-            return
+            return@launch
         }
         if (!task.googleTaskUpToDate(original)
                 && googleTaskDao.getAllByTaskId(task.id).isNotEmpty()) {
@@ -45,32 +46,33 @@ class SyncAdapters @Inject constructor(
         }
     }
 
-    suspend fun sync() {
+    fun sync() {
         sync(false)
     }
 
-    suspend fun sync(immediate: Boolean): Boolean = withContext(NonCancellable) {
+    fun sync(immediate: Boolean) = scope.launch {
-        val googleTasksEnabled = isGoogleTaskSyncEnabled()
+        val googleTasksEnabled = async { isGoogleTaskSyncEnabled() }
-        if (googleTasksEnabled) {
+        val caldavEnabled = async { isCaldavSyncEnabled() }
+        val eteSyncEnabled = async { isEteSyncEnabled() }
+
+        if (googleTasksEnabled.await()) {
             googleTasks.sync(immediate)
         }
 
-        val caldavEnabled = isCaldavSyncEnabled()
+        if (caldavEnabled.await()) {
-        if (caldavEnabled) {
             caldav.sync(immediate)
         }
 
-        val eteSyncEnabled = isEteSyncEnabled()
+        if (eteSyncEnabled.await()) {
-        if (eteSyncEnabled) {
             eteSync.sync(immediate)
         }
 
-        return@withContext googleTasksEnabled || caldavEnabled || eteSyncEnabled
     }
 
-    suspend fun isGoogleTaskSyncEnabled() = googleTaskListDao.getAccounts().isNotEmpty()
+    private suspend fun isGoogleTaskSyncEnabled() = googleTaskListDao.getAccounts().isNotEmpty()
+
+    private suspend fun isCaldavSyncEnabled() = caldavDao.getAccounts(TYPE_CALDAV).isNotEmpty()
 
-    suspend fun isCaldavSyncEnabled() = caldavDao.getAccounts(TYPE_CALDAV).isNotEmpty()
+    private suspend fun isEteSyncEnabled() = caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty()
 
-    suspend fun isEteSyncEnabled() = caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty()
 }