Fix crash when collapsing/expanding all

pull/996/head
Alex Baker 4 years ago
parent e482a881f9
commit 6987fe8bd7

@ -386,12 +386,12 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
true true
} }
R.id.menu_expand_subtasks -> { R.id.menu_expand_subtasks -> {
taskDao.setCollapsed(taskListViewModel.value, false) taskDao.setCollapsed(preferences, filter, false)
localBroadcastManager.broadcastRefresh() localBroadcastManager.broadcastRefresh()
true true
} }
R.id.menu_collapse_subtasks -> { R.id.menu_collapse_subtasks -> {
taskDao.setCollapsed(taskListViewModel.value, true) taskDao.setCollapsed(preferences, filter, true)
localBroadcastManager.broadcastRefresh() localBroadcastManager.broadcastRefresh()
true true
} }

@ -210,8 +210,11 @@ abstract class TaskDao(private val database: Database) {
abstract fun setCollapsed(id: Long, collapsed: Boolean) abstract fun setCollapsed(id: Long, collapsed: Boolean)
@Transaction @Transaction
open fun setCollapsed(tasks: List<TaskContainer>, collapsed: Boolean) { open fun setCollapsed(preferences: Preferences, filter: Filter, collapsed: Boolean) {
DbUtils.batch(tasks.filter(TaskContainer::hasChildren).map(TaskContainer::getId)) { val tasks = fetchTasks(preferences, filter)
.filter(TaskContainer::hasChildren)
.map(TaskContainer::getId)
DbUtils.batch(tasks) {
collapse(it, collapsed) collapse(it, collapsed)
} }
} }

Loading…
Cancel
Save