Fix crash in widget queries

pull/996/head
Alex Baker 6 years ago
parent 5971a79f9a
commit 51e2969437

@ -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);
}

@ -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)

@ -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`)",

Loading…
Cancel
Save