From 7fd5647cb8f93b1bc5bad82a1cdac89fa75704b1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 27 Oct 2023 01:18:18 -0500 Subject: [PATCH] Exclude hidden and completed from snoozed filter --- app/src/main/java/org/tasks/data/TaskDao.kt | 2 +- app/src/main/java/org/tasks/filters/SnoozedFilter.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/tasks/data/TaskDao.kt b/app/src/main/java/org/tasks/data/TaskDao.kt index f58172808..09f574f2f 100644 --- a/app/src/main/java/org/tasks/data/TaskDao.kt +++ b/app/src/main/java/org/tasks/data/TaskDao.kt @@ -42,7 +42,7 @@ abstract class TaskDao(private val database: Database) { @Query("SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0") abstract suspend fun activeTimers(): Int - @Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE type = $TYPE_SNOOZE") + @Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE deleted = 0 AND completed = 0 AND type = $TYPE_SNOOZE") abstract suspend fun snoozedReminders(): Int @Query("SELECT COUNT(1) FROM tasks INNER JOIN notification ON tasks._id = notification.task") diff --git a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt index fcd4d683e..3319a3224 100644 --- a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt +++ b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt @@ -10,6 +10,7 @@ import com.todoroo.astrid.data.Task import kotlinx.parcelize.Parcelize import org.tasks.R import org.tasks.data.Alarm +import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible @Parcelize data class SnoozedFilter( @@ -24,7 +25,7 @@ data class SnoozedFilter( .join(inner(Alarm.TABLE, Task.ID.eq(Alarm.TASK))) .where( and( - Task.DELETION_DATE.lte(0), + activeAndVisible(), Alarm.TYPE.eq(Alarm.TYPE_SNOOZE) ) )