From bd076383502d73feb385836a2e7b945549aed326 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 13 Mar 2019 15:27:50 +0100
Subject: [PATCH] Improve task filtering reliability

---
 .../habitica/ui/fragments/tasks/TasksFragment.kt     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 52e53d675..2f75f3e77 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -72,6 +72,12 @@ class TasksFragment : BaseMainFragment() {
 
         loadTaskLists()
 
+        return v
+    }
+
+    override fun onResume() {
+        super.onResume()
+
         bottomNavigation?.setBadgesHideWhenActive(true)
         bottomNavigation?.setOnTabSelectListener { tabId ->
             when (tabId) {
@@ -82,8 +88,6 @@ class TasksFragment : BaseMainFragment() {
             }
             updateBottomBarBadges()
         }
-
-        return v
     }
 
     override fun onDestroy() {
@@ -137,12 +141,12 @@ class TasksFragment : BaseMainFragment() {
                 dialog.setTags(user?.tags?.createSnapshot() ?: emptyList())
             }
             dialog.setActiveTags(taskFilterHelper.tags)
-            if (activeFragment != null) {
+            /*if (activeFragment != null) {
                 val taskType = activeFragment?.classType
                 if (taskType != null) {
                     dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType))
                 }
-            }
+            }*/
             dialog.setListener(object : TaskFilterDialog.OnFilterCompletedListener {
 
                 override fun onFilterCompleted(activeTaskFilter: String?, activeTags: MutableList<String>) {