From deaeed57c235af93a6461c846bd54e5fe202b93d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 9 Apr 2018 10:07:00 -0500
Subject: [PATCH] Exclude deleted metadata from remote lists

---
 app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java | 1 +
 app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java b/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
index c1bf5bfb0..b3ce32a89 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
@@ -54,6 +54,7 @@ public class CaldavFilter extends Filter {
         .where(
             Criterion.and(
                 TaskDao.TaskCriteria.activeAndVisible(),
+                Field.field("caldav_tasks.deleted").eq(0),
                 Field.field("calendar").eq(caldavCalendar.getUuid())));
   }
 
diff --git a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
index 677e65609..2b89d615e 100644
--- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
@@ -63,6 +63,7 @@ public class GtasksFilter extends Filter {
         .where(
             Criterion.and(
                 TaskDao.TaskCriteria.activeAndVisible(),
+                Field.field("google_tasks.deleted").eq(0),
                 Field.field("list_id").eq(list.getRemoteId())));
   }