From 448b5cd7d944e7cb632c94251520f1b9d12073eb Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Wed, 23 Mar 2022 04:01:42 -0400
Subject: [PATCH] Setting active filters tied to user ViewModel

---
 .../fragments/tasks/TaskRecyclerViewFragment.kt   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 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<FragmentRefreshRecyclerviewBi
 
     override fun onStart() {
         super.onStart()
+        val mainActivity = (activity as? MainActivity)
         if (taskFilterHelper.getActiveFilter(taskType) == null) {
             when (taskType) {
                 TaskType.TODO -> 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)
+                            }
+                        }
                     }
                 }
             }