From 5edc481ffe4ae49501836807f0ff3c687d34652d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 25 Nov 2023 21:42:35 -0600
Subject: [PATCH] Fix etag check for DecSync

---
 .../org/tasks/opentasks/OpenTasksSynchronizer.kt     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
index 785b198ce..39d42903c 100644
--- a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
+++ b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
@@ -15,7 +15,12 @@ import org.tasks.analytics.Constants
 import org.tasks.analytics.Firebase
 import org.tasks.billing.Inventory
 import org.tasks.caldav.iCalendar
-import org.tasks.data.*
+import org.tasks.data.CaldavAccount
+import org.tasks.data.CaldavCalendar
+import org.tasks.data.CaldavDao
+import org.tasks.data.CaldavTask
+import org.tasks.data.MyAndroidTask
+import org.tasks.data.OpenTaskDao
 import org.tasks.data.OpenTaskDao.Companion.filterActive
 import org.tasks.data.OpenTaskDao.Companion.isDavx5
 import org.tasks.data.OpenTaskDao.Companion.isDecSync
@@ -151,7 +156,7 @@ class OpenTasksSynchronizer @Inject constructor(
         val etags = openTaskDao.getEtags(listId)
         etags.forEach { (uid, sync1, version) ->
             val caldavTask = caldavDao.getTaskByRemoteId(calendar.uuid!!, uid)
-            val etag = if (account.isEteSync) version else sync1
+            val etag = if (account.isEteSync || account.isDecSync) version else sync1
             if (caldavTask?.etag == null || caldavTask.etag != etag) {
                 applyChanges(account, calendar, listId, uid, etag, caldavTask)
             }
@@ -236,5 +241,8 @@ class OpenTasksSynchronizer @Inject constructor(
     companion object {
         private val CaldavAccount.isEteSync: Boolean
             get() = uuid?.isEteSync() == true
+
+        private val CaldavAccount.isDecSync: Boolean
+            get() = uuid?.isDecSync() == true
     }
 }
\ No newline at end of file