From 3a0c3a73cc76053f44e2d5eac866dca4788a8d2f Mon Sep 17 00:00:00 2001 From: Hafiz Date: Wed, 23 Mar 2022 04:28:59 -0400 Subject: [PATCH] Set to always populate dailies on user observer --- .../ui/fragments/tasks/TaskRecyclerViewFragment.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt index 1ce585700..54cf14652 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt @@ -460,17 +460,10 @@ open class TaskRecyclerViewFragment : BaseFragment taskFilterHelper.setActiveFilter(TaskType.TODO, Task.FILTER_ACTIVE) TaskType.DAILY -> { - val user = mainActivity?.viewModel?.user?.value - if (user != null) { - if (user.isValid && user.preferences?.dailyDueDefaultView == true) { + mainActivity?.viewModel?.user?.observe(mainActivity){ + if (it?.isValid == true && it.preferences?.dailyDueDefaultView == true) { taskFilterHelper.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE) } - } else { - mainActivity?.viewModel?.user?.observe(mainActivity){ - if (it?.isValid == true && it.preferences?.dailyDueDefaultView == true) { - taskFilterHelper.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE) - } - } } } }