From 1fdeb5fb35f7374fbe2820c2f8b0a6e6dac88d51 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 2 Feb 2023 01:33:46 -0600
Subject: [PATCH] Remove extra sync check

---
 .../main/java/org/tasks/sync/SyncAdapters.kt  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/tasks/sync/SyncAdapters.kt b/app/src/main/java/org/tasks/sync/SyncAdapters.kt
index c1e5037e9..ac5bf7c74 100644
--- a/app/src/main/java/org/tasks/sync/SyncAdapters.kt
+++ b/app/src/main/java/org/tasks/sync/SyncAdapters.kt
@@ -3,16 +3,20 @@ package org.tasks.sync
 import com.todoroo.astrid.data.SyncFlags
 import com.todoroo.astrid.data.SyncFlags.FORCE_CALDAV_SYNC
 import com.todoroo.astrid.data.Task
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
 import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV
 import org.tasks.data.CaldavAccount.Companion.TYPE_ETEBASE
+import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
 import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS
 import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS
 import org.tasks.data.CaldavDao
 import org.tasks.data.GoogleTaskDao
-import org.tasks.data.GoogleTaskListDao
 import org.tasks.data.OpenTaskDao
 import org.tasks.jobs.WorkManager
 import org.tasks.jobs.WorkManager.Companion.TAG_SYNC
@@ -26,7 +30,6 @@ class SyncAdapters @Inject constructor(
         workManager: WorkManager,
         private val caldavDao: CaldavDao,
         private val googleTaskDao: GoogleTaskDao,
-        private val googleTaskListDao: GoogleTaskListDao,
         private val openTaskDao: OpenTaskDao,
         private val preferences: Preferences,
         private val localBroadcastManager: LocalBroadcastManager
@@ -67,19 +70,23 @@ class SyncAdapters @Inject constructor(
     }
 
     fun sync(immediate: Boolean) = scope.launch {
-        val googleTasksEnabled = async { isGoogleTaskSyncEnabled() }
         val caldavEnabled = async { isSyncEnabled() }
         val opentasksEnabled = async { isOpenTaskSyncEnabled() }
 
-        if (googleTasksEnabled.await() || caldavEnabled.await() || opentasksEnabled.await()) {
+        if (caldavEnabled.await() || opentasksEnabled.await()) {
             sync.sync(immediate)
         }
     }
 
-    private suspend fun isGoogleTaskSyncEnabled() = googleTaskListDao.getAccounts().isNotEmpty()
-
     private suspend fun isSyncEnabled() =
-            caldavDao.getAccounts(TYPE_CALDAV, TYPE_TASKS, TYPE_ETEBASE).isNotEmpty()
+            caldavDao
+                .getAccounts(
+                    TYPE_GOOGLE_TASKS,
+                    TYPE_CALDAV,
+                    TYPE_TASKS,
+                    TYPE_ETEBASE,
+                )
+                .isNotEmpty()
 
     private suspend fun isOpenTaskSyncEnabled() = openTaskDao.shouldSync()