From b9a5e1cf023bcda0acce178199d841f19deb217b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 6 Nov 2019 16:48:23 -0600 Subject: [PATCH] Exclude moved remote tasks from drawer count --- app/src/main/java/org/tasks/data/CaldavDao.java | 2 +- app/src/main/java/org/tasks/data/GoogleTaskListDao.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/tasks/data/CaldavDao.java b/app/src/main/java/org/tasks/data/CaldavDao.java index 3ae898f28..73951442f 100644 --- a/app/src/main/java/org/tasks/data/CaldavDao.java +++ b/app/src/main/java/org/tasks/data/CaldavDao.java @@ -102,7 +102,7 @@ public abstract class CaldavDao { + " FROM caldav_accounts" + " LEFT JOIN caldav_lists ON caldav_lists.cdl_account = caldav_accounts.cda_uuid" + " LEFT JOIN caldav_tasks ON caldav_tasks.cd_calendar = caldav_lists.cdl_uuid" - + " LEFT JOIN tasks ON caldav_tasks.cd_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now" + + " LEFT JOIN tasks ON caldav_tasks.cd_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now AND cd_deleted = 0" + " GROUP BY caldav_lists.cdl_uuid" + " ORDER BY caldav_accounts.cda_name COLLATE NOCASE, caldav_lists.cdl_name COLLATE NOCASE") public abstract List getCaldavFilters(long now); diff --git a/app/src/main/java/org/tasks/data/GoogleTaskListDao.java b/app/src/main/java/org/tasks/data/GoogleTaskListDao.java index d65f4c174..86e5fe230 100644 --- a/app/src/main/java/org/tasks/data/GoogleTaskListDao.java +++ b/app/src/main/java/org/tasks/data/GoogleTaskListDao.java @@ -64,7 +64,7 @@ public abstract class GoogleTaskListDao { + " FROM google_task_accounts " + " LEFT JOIN google_task_lists ON google_task_lists.gtl_account = google_task_accounts.gta_account" + " LEFT JOIN google_tasks ON google_tasks.gt_list_id = google_task_lists.gtl_remote_id" - + " LEFT JOIN tasks ON google_tasks.gt_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now" + + " LEFT JOIN tasks ON google_tasks.gt_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now AND gt_deleted = 0" + " GROUP BY google_task_lists.gtl_remote_id" + " ORDER BY google_task_lists.gtl_account COLLATE NOCASE, google_task_lists.gtl_title COLLATE NOCASE") public abstract List getGoogleTaskFilters(long now);