From 3e880898d4840584c04870ef516e5a822808cb0d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 22 Jan 2018 15:44:44 -0600
Subject: [PATCH] Convert uuidFromLocalId to room

---
 .../org/tasks/gtasks/GoogleTaskSyncAdapter.java    |  4 +++-
 .../main/java/com/todoroo/astrid/dao/TaskDao.java  | 14 ++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java b/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
index c2b5685bb..2ba1e0698 100644
--- a/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
+++ b/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
@@ -73,6 +73,7 @@ import javax.inject.Inject;
 
 import timber.log.Timber;
 
+import static com.todoroo.astrid.data.Task.NO_UUID;
 import static org.tasks.date.DateTimeUtils.newDateTime;
 
 /**
@@ -359,7 +360,8 @@ public class GoogleTaskSyncAdapter extends InjectingAbstractThreadedSyncAdapter
         GoogleTask googleTask = getMetadataByGtaskId(remoteTask.gtaskMetadata.getRemoteId());
         if (googleTask != null) {
             remoteTask.task.setId(googleTask.getTask());
-            remoteTask.task.setUuid(taskDao.uuidFromLocalId(remoteTask.task.getId()));
+            String uuid = taskDao.uuidFromLocalId(remoteTask.task.getId());
+            remoteTask.task.setUuid(Strings.isNullOrEmpty(uuid) ? NO_UUID : uuid);
             remoteTask.gtaskMetadata = googleTask;
         }
     }
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 240e47185..f923a8c57 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
@@ -165,18 +165,8 @@ public abstract class TaskDao {
     	}
     }
 
-    public String uuidFromLocalId(long localId) {
-        TodorooCursor cursor = dao.query(Query.select(Task.UUID).where(AbstractModel.ID_PROPERTY.eq(localId)));
-        try {
-            if (cursor.getCount() == 0) {
-                return Task.NO_UUID;
-            }
-            cursor.moveToFirst();
-            return cursor.get(Task.UUID);
-        } finally {
-            cursor.close();
-        }
-    }
+    @android.arch.persistence.room.Query("SELECT remoteId FROM tasks WHERE _id = :localId")
+    public abstract String uuidFromLocalId(long localId);
 
     // --- delete