From e1efcd3e9c947e405a1607d1e2e0e2ca98957a95 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 7 Nov 2019 08:56:46 -0600
Subject: [PATCH] Preserve subtasks when moving from edit screen

---
 .../main/java/com/todoroo/astrid/service/TaskMover.java  | 9 +++++----
 app/src/main/java/org/tasks/ui/RemoteListFragment.java   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
index 6a48d9d14..0a7f7778e 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
@@ -4,6 +4,7 @@ import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Lists.transform;
 import static com.todoroo.andlib.utility.DateUtilities.now;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 import com.todoroo.astrid.api.CaldavFilter;
 import com.todoroo.astrid.api.Filter;
@@ -45,6 +46,10 @@ public class TaskMover {
     this.preferences = preferences;
   }
 
+  public void move(Long task, Filter selectedList) {
+    move(singletonList(task), selectedList);
+  }
+
   public void move(List<Long> tasks, Filter selectedList) {
     tasks = newArrayList(tasks);
     tasks.removeAll(googleTaskDao.findChildrenInList(tasks));
@@ -61,10 +66,6 @@ public class TaskMover {
     syncAdapters.sync();
   }
 
-  public void move(Task task, Filter selectedList) {
-    performMove(task, selectedList);
-  }
-
   public Filter getSingleFilter(List<Long> tasks) {
     List<String> caldavCalendars = caldavDao.getCalendars(tasks);
     List<String> googleTaskLists = googleTaskDao.getLists(tasks);
diff --git a/app/src/main/java/org/tasks/ui/RemoteListFragment.java b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
index 164cb5aed..738d9f37e 100644
--- a/app/src/main/java/org/tasks/ui/RemoteListFragment.java
+++ b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
@@ -145,7 +145,7 @@ public class RemoteListFragment extends TaskEditControlFragment {
 
   @Override
   public void apply(Task task) {
-    taskMover.move(task, selectedList);
+    taskMover.move(task.getId(), selectedList);
   }
 
   @Override