From 115e55b08f3df0b80757ed36910c5cfc254a92e5 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 12 Jun 2019 16:42:52 -0500
Subject: [PATCH] Fix move query

---
 app/src/main/java/com/todoroo/astrid/dao/TaskDao.java       | 2 +-
 app/src/main/java/com/todoroo/astrid/service/TaskMover.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
index b5482842c..4ae1364f4 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
@@ -66,7 +66,7 @@ public abstract class TaskDao {
   public abstract List<Task> fetch(List<Long> taskIds);
 
   @Query(
-      "SELECT tasks.* FROM tasks LEFT JOIN google_tasks ON gt_task = _id WHERE _id IN (:taskIds) AND gt_parent NOT IN (:taskIds)")
+      "SELECT tasks.* FROM tasks LEFT JOIN google_tasks ON gt_task = _id WHERE _id IN (:taskIds) AND (gt_task IS NULL OR gt_parent NOT IN (:taskIds))")
   public abstract List<Task> fetchExcludingChildren(List<Long> taskIds);
 
   @Query("SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0")
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 94eb5e97c..ad4a69163 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
@@ -122,7 +122,7 @@ public class TaskMover {
       String listId = ((CaldavFilter) selectedList).getUuid();
       caldavDao.insert(
           transform(
-              concat(singletonList(id), transform(googleTaskChildren, GoogleTask::getId)),
+              concat(singletonList(id), transform(googleTaskChildren, GoogleTask::getTask)),
               _id -> new CaldavTask(_id, listId, UUIDHelper.newUUID())));
     }
   }