From 51e296943743c0b3a707fa0143e87143593d0230 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 22 May 2020 12:47:37 -0500 Subject: [PATCH] Fix crash in widget queries --- .../main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java | 4 ++-- app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt | 2 +- app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java index c0e596d5c..0f9415e6b 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -1,7 +1,7 @@ package com.todoroo.astrid.subtasks; import static org.tasks.Strings.isNullOrEmpty; -import static org.tasks.db.QueryUtils.showHidden; +import static org.tasks.db.QueryUtils.showHiddenAndCompleted; import android.content.Context; import androidx.annotation.NonNull; @@ -146,7 +146,7 @@ public class SubtasksHelper { query = query.replaceAll("ORDER BY .*", ""); query = query + String.format(" ORDER BY %s", getOrderString(tagData, tlm)); - query = showHidden(query); + query = showHiddenAndCompleted(query); filter.setFilterQueryOverride(query); } diff --git a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt index 7960776c1..d762870fc 100644 --- a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt +++ b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt @@ -32,7 +32,7 @@ internal object TaskListQueryNonRecursive { } else { "$query GROUP BY ${Task.ID}" } - return listOf( + return mutableListOf( Query.select(*FIELDS) .withQueryTemplate(PermaSql.replacePlaceholdersForQuery(groupedQuery)) .from(Task.TABLE) diff --git a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt index dae392c6d..514040522 100644 --- a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt +++ b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt @@ -103,7 +103,7 @@ internal object TaskListQueryRecursive { ) SELECT * FROM recursive_tasks """.trimIndent() - return listOf( + return mutableListOf( "DROP TABLE IF EXISTS `temp`.`recursive_tasks`", SortHelper.adjustQueryForFlags(preferences, withClause), "CREATE INDEX `r_tasks` ON `recursive_tasks` (`task`)",