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 2cfc4361e..e01ce008e 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -277,7 +277,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI } if (preferences.disableSubtasks() || !filter.supportsSubtasks() - || taskAdapter.supportsManualSorting()) { + || taskAdapter.supportsAstridSorting()) { 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/adapter/AstridTaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt index c84ec14f3..122b0d2ea 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt @@ -36,7 +36,7 @@ class AstridTaskAdapter internal constructor( return updater.getIndentForTask(previous.uuid) + 1 } - override fun supportsManualSorting() = true + override fun supportsAstridSorting() = true override fun moved(from: Int, to: Int, indent: Int) { val source = getTask(from) diff --git a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt index a6c770503..82fda4af1 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt @@ -13,8 +13,6 @@ class CaldavManualSortTaskAdapter internal constructor( private val localBroadcastManager: LocalBroadcastManager) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) { - override fun supportsManualSorting() = true - override fun moved(from: Int, to: Int, indent: Int) { val task = getTask(from) val oldParent = task.parent diff --git a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt index e13c36188..79f375228 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt @@ -13,8 +13,6 @@ class GoogleTaskManualSortAdapter internal constructor( private val localBroadcastManager: LocalBroadcastManager) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) { - override fun supportsManualSorting() = true - override fun moved(from: Int, to: Int, indent: Int) { val task = getTask(from) val googleTask = task.googleTask diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt index 0cef7fcba..486972ec8 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt @@ -124,7 +124,7 @@ open class TaskAdapter( } } - open fun supportsManualSorting(): Boolean = false + open fun supportsAstridSorting(): Boolean = false open fun moved(from: Int, to: Int, indent: Int) { val task = getTask(from)