diff options
author | Stefan Niedermann <info@niedermann.it> | 2024-01-18 15:49:16 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2024-01-18 15:49:16 +0300 |
commit | 152bc59657154cc648a84f41dca1b8d989018b97 (patch) | |
tree | bf050cbcd36fb38917cdd1803694daa69f503d12 /app | |
parent | 598d87f43038d6742ab847d87907050e3b8aa3c5 (diff) |
fix(done): Fix crash when filtering for both, done and due date at the same time
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java | 14 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java index 42c696b1a..a95ab7a8c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java @@ -352,19 +352,19 @@ public class DataBaseAdapter { if (filter.getDueType() != EDueType.NO_FILTER) { switch (filter.getDueType()) { case NO_DUE: - query.append("and c.dueDate is null"); + query.append("and c.dueDate is null "); break; case OVERDUE: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') <= datetime('now', 'localtime')"); + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') <= datetime('now', 'localtime') "); break; case TODAY: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+24 hour', 'localtime')"); + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+24 hour', 'localtime') "); break; case WEEK: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+7 day', 'localtime')"); + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+7 day', 'localtime') "); break; case MONTH: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+30 day', 'localtime')"); + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+30 day', 'localtime') "); break; default: throw new IllegalArgumentException("You need to add your new " + EDueType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); @@ -374,10 +374,10 @@ public class DataBaseAdapter { if (filter.getDoneType() != EDoneType.NO_FILTER) { switch (filter.getDoneType()) { case DONE: - query.append("and (c.done is not null and c.done != 0)"); + query.append("and (c.done is not null and c.done != 0) "); break; case UNDONE: - query.append("and (c.done is null or c.done = 0)"); + query.append("and (c.done is null or c.done = 0) "); break; default: throw new IllegalArgumentException("You need to add your new " + EDoneType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java index 807130a0d..7a6aba31d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java @@ -182,7 +182,7 @@ public class Version implements Comparable<Version> { * @see <a href="https://github.com/nextcloud/deck/issues/534">Deck server issue #534</a> */ public boolean supportsDone() { - return isGreaterOrEqualTo(VERSION_1_12_0); + return isGreaterOrEqualTo(VERSION_1_12_2); } /** |