From 57a8fe6839e2b8fe33fa172591bf9c014e89b2db Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 14 Apr 2018 07:54:54 -0500 Subject: [PATCH] Only fetch google tasks that haven't moved --- app/src/main/java/com/todoroo/astrid/dao/TaskDao.java | 6 +----- 1 file changed, 1 insertion(+), 5 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 cd8058937..31a38bfbf 100644 --- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -137,13 +137,9 @@ public abstract class TaskDao { public abstract int deleteById(long id); @android.arch.persistence.room.Query( - "SELECT tasks.* FROM tasks INNER JOIN google_tasks ON google_tasks.task = tasks._id WHERE google_tasks.list_id = :googleTaskList") + "SELECT tasks.* FROM tasks INNER JOIN google_tasks ON google_tasks.task = tasks._id WHERE google_tasks.deleted = 0 AND google_tasks.list_id = :googleTaskList") public abstract List getGoogleTasks(String googleTaskList); - @android.arch.persistence.room.Query( - "SELECT tasks.* FROM tasks INNER JOIN caldav_tasks ON caldav_tasks.task = tasks._id WHERE caldav_tasks.calendar = :calendar") - public abstract List getCaldavTasks(String calendar); - /** * Saves the given task to the database.getDatabase(). Task must already exist. Returns true on * success.