From 374f10c731d406e2c507e626347131cd6d7dd2eb Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 19 Sep 2023 11:15:16 -0500
Subject: [PATCH] Add subtasks in order for new tasks

---
 app/src/main/java/org/tasks/ui/TaskEditViewModel.kt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 7624b3293..fc716cdba 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -326,7 +326,11 @@ class TaskEditViewModel @Inject constructor(
                     )
                     subtask.parent = task.id
                     googleTask.isMoved = true
-                    googleTaskDao.insertAndShift(subtask, googleTask, preferences.addTasksToTop())
+                    googleTaskDao.insertAndShift(
+                        task = subtask,
+                        caldavTask = googleTask,
+                        top = if (isNew) false else preferences.addTasksToTop()
+                    )
                 }
                 is CaldavFilter -> {
                     val caldavTask = CaldavTask(
@@ -336,7 +340,11 @@ class TaskEditViewModel @Inject constructor(
                     subtask.parent = task.id
                     caldavTask.remoteParent = caldavDao.getRemoteIdForTask(task.id)
                     taskDao.save(subtask)
-                    caldavDao.insert(subtask, caldavTask, preferences.addTasksToTop())
+                    caldavDao.insert(
+                        task = subtask,
+                        caldavTask = caldavTask,
+                        addToTop = if (isNew) false else preferences.addTasksToTop()
+                    )
                 }
                 else -> {
                     subtask.parent = task.id