Fix task order shifting

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()
     }

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?) {
+    open suspend fun move(task: TaskContainer, previousParent: Long, newParent: Long, newPosition: Long?) {
-        val previousParent = task.parent
         val previousPosition = task.caldavSortOrder
         if (newPosition != null) {
             if (newParent == previousParent && newPosition < previousPosition) {