diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ba365355..95a7793eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 13.6.2 (2023-11-30) + +* Fix updating modification timestamp on edits + ### 13.6.1 (2023-11-27) * Push pending changes when app is backgrounded diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b2c53a699..b68eb4211 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,8 +55,8 @@ android { defaultConfig { testApplicationId = "org.tasks.test" applicationId = "org.tasks" - versionCode = 130603 - versionName = "13.6.1" + versionCode = 130604 + versionName = "13.6.2" targetSdk = 33 minSdk = 24 testInstrumentationRunner = "org.tasks.TestRunner" 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 09f574f2f..3f8771a65 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 diff --git a/fastlane/metadata/android/en-US/changelogs/130604.txt b/fastlane/metadata/android/en-US/changelogs/130604.txt new file mode 100644 index 000000000..818ad0a58 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/130604.txt @@ -0,0 +1 @@ +* Fix updating modification timestamp on edits