From 251edd39edde3825c54c31c95a81982c90ce6f34 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 24 Apr 2023 23:19:43 -0500
Subject: [PATCH] Fix task order shifting

---
 .../com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt  | 2 +-
 app/src/main/java/org/tasks/data/CaldavDao.kt                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt
index cec2beb44..924dfb4d7 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt
@@ -34,7 +34,7 @@ class CaldavManualSortTaskAdapter internal constructor(
             indent == previous.indent -> previous.caldavSortOrder + 1
             else -> getTask((to - 1 downTo 0).find { getTask(it).indent == indent }!!).caldavSortOrder + 1
         }
-        caldavDao.move(task, newParent, newPosition)
+        caldavDao.move(task, oldParent, newParent, newPosition)
         taskDao.touch(task.id)
         localBroadcastManager.broadcastRefresh()
     }
diff --git a/app/src/main/java/org/tasks/data/CaldavDao.kt b/app/src/main/java/org/tasks/data/CaldavDao.kt
index 069c75a59..b0208848b 100644
--- a/app/src/main/java/org/tasks/data/CaldavDao.kt
+++ b/app/src/main/java/org/tasks/data/CaldavDao.kt
@@ -308,8 +308,7 @@ GROUP BY caldav_lists.cdl_uuid
     abstract suspend fun updateParents(calendar: String)
 
     @Transaction
-    open suspend fun move(task: TaskContainer, newParent: Long, newPosition: Long?) {
-        val previousParent = task.parent
+    open suspend fun move(task: TaskContainer, previousParent: Long, newParent: Long, newPosition: Long?) {
         val previousPosition = task.caldavSortOrder
         if (newPosition != null) {
             if (newParent == previousParent && newPosition < previousPosition) {