From 4c23489e9a1736dfd7e9ab7aaed146d4e917ca2d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 21 Apr 2018 21:49:58 -0500
Subject: [PATCH] Exclude deleted caldav and google task lists

---
 .../main/java/org/tasks/ui/TaskListViewModel.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.java b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
index 410bc141d..feec8c24c 100644
--- a/app/src/main/java/org/tasks/ui/TaskListViewModel.java
+++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
@@ -69,9 +69,13 @@ public class TaskListViewModel extends ViewModel {
     Criterion tagsJoinCriterion =
         Criterion.and(Task.ID.eq(Field.field(TAGS_METADATA_JOIN + ".task")));
     Criterion gtaskJoinCriterion =
-        Criterion.and(Task.ID.eq(Field.field(GTASK_METADATA_JOIN + ".task")));
+        Criterion.and(
+            Task.ID.eq(Field.field(GTASK_METADATA_JOIN + ".task")),
+            Field.field(GTASK_METADATA_JOIN + ".deleted").eq(0));
     Criterion caldavJoinCriterion =
-        Criterion.and(Task.ID.eq(Field.field(CALDAV_METADATA_JOIN + ".task")));
+        Criterion.and(
+            Task.ID.eq(Field.field(CALDAV_METADATA_JOIN + ".task")),
+            Field.field(CALDAV_METADATA_JOIN + ".deleted").eq(0));
     if (filter instanceof TagFilter) {
       String uuid = ((TagFilter) filter).getUuid();
       tagsJoinCriterion =
@@ -79,12 +83,13 @@ public class TaskListViewModel extends ViewModel {
     } else if (filter instanceof GtasksFilter) {
       String listId = ((GtasksFilter) filter).getRemoteId();
       gtaskJoinCriterion =
-          Criterion.and(gtaskJoinCriterion, Field.field(GTASK_METADATA_JOIN + ".list_id").neq(listId));
+          Criterion.and(
+              gtaskJoinCriterion, Field.field(GTASK_METADATA_JOIN + ".list_id").neq(listId));
     } else if (filter instanceof CaldavFilter) {
       String uuid = ((CaldavFilter) filter).getUuid();
       caldavJoinCriterion =
           Criterion.and(
-      caldavJoinCriterion, Field.field(CALDAV_METADATA_JOIN + ".calendar").neq(uuid));
+              caldavJoinCriterion, Field.field(CALDAV_METADATA_JOIN + ".calendar").neq(uuid));
     }
 
     // TODO: For now, we'll modify the query to join and include the things like tag data here.