From b477623524de02c283f0b78800ebadd12d1125e1 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 30 Oct 2023 17:56:55 -0500
Subject: [PATCH] Update timestamp on edits

Fix bugs introduced by 775289b05
---
 app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt | 2 +-
 app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt    | 2 +-
 app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt    | 2 +-
 app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt | 2 +-
 app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt     | 2 +-
 app/src/main/java/org/tasks/data/TaskDao.kt                    | 2 +-
 app/src/main/java/org/tasks/ui/TaskEditViewModel.kt            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt b/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt
index bc4936efe..0b0cdf9a4 100644
--- a/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt
+++ b/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt
@@ -112,7 +112,7 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     fun ignoreDeletedTasksWhenShiftingDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
-        taskDao.update(taskDao.fetch(tasks[0].id).apply { this?.deletionDate = now() }!!)
+        taskDao.update(taskDao.fetch(tasks[0].id).apply { this?.deletionDate = now() }!!, null)
 
         caldavDao.shiftDown("calendar", 0, created.toAppleEpoch())
 
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
index 134730848..c5547f267 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
@@ -443,6 +443,6 @@ open class TaskAdapter(
             task.parent = newParent
         }
         caldavDao.update(caldavTask.id, caldavTask.remoteParent)
-        taskDao.save(task.task, null)
+        taskDao.save(task.task)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt b/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt
index 013d1590f..c1acd0aa2 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt
@@ -114,7 +114,7 @@ class TaskCreator @Inject constructor(
                 locationDao.insert(Geofence(place.uid, preferences))
             }
         }
-        taskDao.save(task, null)
+        taskDao.save(task)
         alarmDao.insert(task.getDefaultAlarms())
         return task
     }
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt
index b958e705b..de4b42ba2 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt
@@ -99,7 +99,7 @@ class TaskDuplicator @Inject constructor(
             alarmDao.insert(alarms.map { Alarm(clone.id, it.time, it.type) })
         }
         gcalHelper.createTaskEventIfEnabled(clone)
-        taskDao.save(clone, null) // TODO: delete me
+        taskDao.save(clone) // TODO: delete me
         taskAttachmentDao
             .getAttachmentsForTask(originalId)
             .map {
diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt
index d9a1f9963..393ff1aee 100644
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt
@@ -55,7 +55,7 @@ class TimerPlugin @Inject constructor(
                 task.elapsedSeconds = task.elapsedSeconds + newElapsed
             }
         }
-        taskDao.update(task)
+        taskDao.update(task, taskDao.fetch(task.id))
         updateNotifications()
     }
 
diff --git a/app/src/main/java/org/tasks/data/TaskDao.kt b/app/src/main/java/org/tasks/data/TaskDao.kt
index f58172808..08961aa2e 100644
--- a/app/src/main/java/org/tasks/data/TaskDao.kt
+++ b/app/src/main/java/org/tasks/data/TaskDao.kt
@@ -188,7 +188,7 @@ FROM recursive_tasks
     @Insert
     abstract suspend fun insert(task: Task): Long
 
-    suspend fun update(task: Task, original: Task? = null): Task =
+    suspend fun update(task: Task, original: Task?): Task =
         task
             .copy(
                 modificationDate = when {
diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 8d1ade3cd..fdc845314 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -300,7 +300,7 @@ class TaskEditViewModel @Inject constructor(
             selectedAlarms.value = selectedAlarms.value.filterNot { a -> a.type == TYPE_REL_END }
         }
 
-        taskDao.save(task, null)
+        taskDao.save(task)
 
         if (isNew || originalList != selectedList.value) {
             task.parent = 0