From b9de4ea7efa9bdd1a5c4902ab64245754618d811 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 27 May 2020 14:59:36 -0500 Subject: [PATCH] Rename method to supportsSubtasks --- .../main/java/com/todoroo/astrid/activity/TaskListFragment.kt | 2 +- app/src/main/java/com/todoroo/astrid/api/Filter.java | 2 +- app/src/main/java/org/tasks/data/TaskListQuery.kt | 2 +- app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt index d3c36f836..219c28617 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -278,7 +278,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI sortMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) } if (preferences.disableSubtasks() - || !filter.supportSubtasks() + || !filter.supportsSubtasks() || taskAdapter.supportsManualSorting()) { menu.findItem(R.id.menu_collapse_subtasks).isVisible = false menu.findItem(R.id.menu_expand_subtasks).isVisible = false diff --git a/app/src/main/java/com/todoroo/astrid/api/Filter.java b/app/src/main/java/com/todoroo/astrid/api/Filter.java index dc20849d7..69cfc1d3c 100644 --- a/app/src/main/java/com/todoroo/astrid/api/Filter.java +++ b/app/src/main/java/com/todoroo/astrid/api/Filter.java @@ -189,7 +189,7 @@ public class Filter extends FilterListItem { return true; } - public boolean supportSubtasks() { + public boolean supportsSubtasks() { return true; } diff --git a/app/src/main/java/org/tasks/data/TaskListQuery.kt b/app/src/main/java/org/tasks/data/TaskListQuery.kt index 790fd98d2..a68950efa 100644 --- a/app/src/main/java/org/tasks/data/TaskListQuery.kt +++ b/app/src/main/java/org/tasks/data/TaskListQuery.kt @@ -42,7 +42,7 @@ object TaskListQuery { getNonRecursiveQuery(filter, preferences) } } - return if (filter.supportSubtasks() && subtasks.usesSubtasks() && preferences.showSubtasks()) { + return if (filter.supportsSubtasks() && subtasks.usesSubtasks() && preferences.showSubtasks()) { getRecursiveQuery(filter, preferences, subtasks) } else { getNonRecursiveQuery(filter, preferences) diff --git a/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.java b/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.java index 2ba9bcc37..4fd7e3310 100644 --- a/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.java +++ b/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.java @@ -51,7 +51,7 @@ public class RecentlyModifiedFilter extends Filter { } @Override - public boolean supportSubtasks() { + public boolean supportsSubtasks() { return false; }