From abf7a0628219b6240ad6564842039c6e0aee4ccb Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 17 Aug 2020 12:25:03 -0500
Subject: [PATCH] Use SYNC1 as DAVx5 etag

---
 app/src/main/java/org/tasks/data/OpenTaskDao.kt           | 8 ++++----
 .../java/org/tasks/opentasks/OpenTasksSynchronizer.kt     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/tasks/data/OpenTaskDao.kt b/app/src/main/java/org/tasks/data/OpenTaskDao.kt
index 8f095bbac..f709a4cb0 100644
--- a/app/src/main/java/org/tasks/data/OpenTaskDao.kt
+++ b/app/src/main/java/org/tasks/data/OpenTaskDao.kt
@@ -62,18 +62,18 @@ class OpenTaskDao @Inject constructor(
         calendars
     }
 
-    suspend fun getEtags(listId: Long): List<Triple<String, String, String>> = withContext(Dispatchers.IO) {
-        val items = ArrayList<Triple<String, String, String>>()
+    suspend fun getEtags(listId: Long): List<Triple<String, String?, String>> = withContext(Dispatchers.IO) {
+        val items = ArrayList<Triple<String, String?, String>>()
         cr.query(
                 tasks,
-                arrayOf(Tasks._SYNC_ID, Tasks.SYNC_VERSION, "version"),
+                arrayOf(Tasks._SYNC_ID, Tasks.SYNC1, "version"),
                 "${Tasks.LIST_ID} = $listId",
                 null,
                 null)?.use {
             while (it.moveToNext()) {
                 items.add(Triple(
                         it.getString(Tasks._SYNC_ID)!!,
-                        it.getLong(Tasks.SYNC_VERSION).toString(),
+                        it.getString(Tasks.SYNC1),
                         it.getLong("version").toString()))
             }
         }
diff --git a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
index 868a75861..1570c11ec 100644
--- a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
+++ b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt
@@ -159,9 +159,9 @@ class OpenTasksSynchronizer @Inject constructor(
         }
 
         val etags = openTaskDao.getEtags(listId)
-        etags.forEach { (syncId, syncVersion, version) ->
+        etags.forEach { (syncId, sync1, version) ->
             val caldavTask = caldavDao.getTask(calendar.uuid!!, syncId)
-            val etag = if (isEteSync) version else syncVersion
+            val etag = if (isEteSync) version else sync1
             if (caldavTask?.etag == null || caldavTask.etag != etag) {
                 applyChanges(calendar, listId, syncId, etag, caldavTask)
             }
@@ -265,7 +265,7 @@ class OpenTasksSynchronizer @Inject constructor(
             calendar: CaldavCalendar,
             listId: Long,
             syncId: String,
-            etag: String,
+            etag: String?,
             existing: CaldavTask?) {
         cr.query(
                 Tasks.getContentUri(openTaskDao.authority),