From 26ab3d5866dbc040ad726cc7b42b6d910f7d5802 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 28 Mar 2024 10:39:46 -0500 Subject: [PATCH] Exclude past snooze times from Snooze Filter This should exclude tasks that were completed before their snooze time lapsed --- app/src/main/java/org/tasks/data/Alarm.kt | 1 + app/src/main/java/org/tasks/filters/SnoozedFilter.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/tasks/data/Alarm.kt b/app/src/main/java/org/tasks/data/Alarm.kt index 43e7304f7..5872e106a 100644 --- a/app/src/main/java/org/tasks/data/Alarm.kt +++ b/app/src/main/java/org/tasks/data/Alarm.kt @@ -119,6 +119,7 @@ class Alarm : Parcelable { @JvmField val TABLE = Table(TABLE_NAME) @JvmField val TASK = TABLE.column("task") @JvmField val TYPE = TABLE.column("type") + @JvmField val TIME = TABLE.column("time") const val TYPE_DATE_TIME = 0 const val TYPE_REL_START = 1 diff --git a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt index 0ecec47eb..d44e59547 100644 --- a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt +++ b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt @@ -1,6 +1,7 @@ package org.tasks.filters import com.todoroo.andlib.sql.Criterion.Companion.and +import com.todoroo.andlib.sql.Functions.now import com.todoroo.andlib.sql.Join.Companion.inner import com.todoroo.andlib.sql.QueryTemplate import com.todoroo.astrid.api.Filter @@ -24,7 +25,8 @@ data class SnoozedFilter( .where( and( activeAndVisible(), - Alarm.TYPE.eq(Alarm.TYPE_SNOOZE) + Alarm.TYPE.eq(Alarm.TYPE_SNOOZE), + Alarm.TIME.gt(now()), ) ) .toString()