From abc22f070c9916dece9d7b86d5180999dfd0fa42 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 9 Dec 2015 16:39:40 +0100
Subject: [PATCH] fix tag filtering.

---
 .../com/habitrpg/android/habitica/helpers/TagsHelper.java    | 4 ++++
 .../android/habitica/ui/fragments/TasksFragment.java         | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/com/habitrpg/android/habitica/helpers/TagsHelper.java b/Habitica/src/com/habitrpg/android/habitica/helpers/TagsHelper.java
index ccacbf406..e5b724911 100644
--- a/Habitica/src/com/habitrpg/android/habitica/helpers/TagsHelper.java
+++ b/Habitica/src/com/habitrpg/android/habitica/helpers/TagsHelper.java
@@ -32,6 +32,10 @@ public class TagsHelper {
         return this.tagsId;
     }
 
+    public boolean isTagChecked(String tagID) {
+        return this.tagsId.contains(tagID);
+    }
+
     public List<Task> filter(List<Task> tasks) {
         List<Task> filtered = new ArrayList<Task>();
         for (Task t : tasks) {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
index 456d791b9..f81464856 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
@@ -161,7 +161,9 @@ public class TasksFragment extends BaseFragment implements OnCheckedChangeListen
         filterDrawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.RIGHT);
 
         viewPager.setCurrentItem(0);
-        this.tagsHelper = new TagsHelper();
+        if (this.tagsHelper == null) {
+            this.tagsHelper = new TagsHelper();
+        }
 
         loadTaskLists();
 
@@ -462,6 +464,7 @@ public class TasksFragment extends BaseFragment implements OnCheckedChangeListen
             filterDrawer.addItem(new SwitchDrawerItem()
                             .withName(t.getName())
                             .withTag(t)
+                            .withChecked(this.tagsHelper.isTagChecked(t.getId()))
                             .withOnCheckedChangeListener(this)
             );
         }