From 4ff7b18c0fceecfdb6c96c021e11ca8551b54911 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 23 Mar 2024 14:46:40 -0500
Subject: [PATCH] Fix cloning google tasks

---
 .../java/com/todoroo/astrid/service/TaskDuplicator.kt  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 f8b913bd8..410631a52 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt
@@ -67,7 +67,7 @@ class TaskDuplicator @Inject constructor(
             tagDao.insert(tags.map { Tag(clone, it) })
         }
         val googleTask = googleTaskDao.getByTaskId(task.id)
-        val addToTop = preferences.addTasksToTop()
+        val caldavTask = caldavDao.getTask(task.id)
         if (googleTask != null) {
             googleTaskDao.insertAndShift(
                 clone,
@@ -76,11 +76,9 @@ class TaskDuplicator @Inject constructor(
                     calendar = googleTask.calendar,
                     remoteId = null
                 ),
-                addToTop
+                preferences.addTasksToTop()
             )
-        }
-        val caldavTask = caldavDao.getTask(task.id)
-        if (caldavTask != null) {
+        } else if (caldavTask != null) {
             val newDavTask = CaldavTask(
                 task = clone.id,
                 calendar = caldavTask.calendar
@@ -89,7 +87,7 @@ class TaskDuplicator @Inject constructor(
                 val remoteParent = caldavDao.getRemoteIdForTask(parentId)
                 newDavTask.remoteParent = remoteParent
             }
-            caldavDao.insert(clone, newDavTask, addToTop)
+            caldavDao.insert(clone, newDavTask, preferences.addTasksToTop())
         }
         for (g in locationDao.getGeofencesForTask(task.id)) {
             locationDao.insert(