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 fb6df1912..1ce585700 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 @@ -455,13 +455,22 @@ open class TaskRecyclerViewFragment : BaseFragment taskFilterHelper.setActiveFilter(TaskType.TODO, Task.FILTER_ACTIVE) TaskType.DAILY -> { - val user = (activity as? MainActivity)?.viewModel?.user?.value - if (user?.isValid == true && user.preferences?.dailyDueDefaultView == true) { - taskFilterHelper.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE) + val user = mainActivity?.viewModel?.user?.value + if (user != null) { + if (user.isValid && user.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) + } + } } } }