From 152bc59657154cc648a84f41dca1b8d989018b97 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 18 Jan 2024 13:49:16 +0100 Subject: fix(done): Fix crash when filtering for both, done and due date at the same time Signed-off-by: Stefan Niedermann --- .../nextcloud/deck/database/DataBaseAdapter.java | 14 +++++++------- .../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 { * @see Deck server issue #534 */ public boolean supportsDone() { - return isGreaterOrEqualTo(VERSION_1_12_0); + return isGreaterOrEqualTo(VERSION_1_12_2); } /** -- cgit v1.2.3