Store current filter in TaskListActivity

src/main/java/com/todoroo/astrid/activity/TaskListActivity.java

@@ -108,6 +108,8 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
     public static final String LOAD_FILTER = "load_filter";
     public static final String OPEN_TASK = "open_task"; //$NON-NLS-1$
 
+    private Filter filter;
+
     /**
      * @see android.app.Activity#onCreate(Bundle)
      */
@@ -182,7 +184,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
     }
 
     private void loadTaskListFragment(TaskListFragment taskListFragment) {
-        Filter filter = taskListFragment.filter;
+        filter = taskListFragment.filter;
         ThemeColor themeColor = filter.tint >= 0
                 ? themeCache.getThemeColor(filter.tint)
                 : theme.getThemeColor();
@@ -508,7 +510,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
     }
 
     public Filter getCurrentFilter() {
-        return getTaskListFragment().filter;
+        return filter;
     }
 
     @Override

src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -24,7 +24,6 @@ import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
-import com.todoroo.astrid.api.TagFilter;
 import com.todoroo.astrid.core.CustomFilterActivity;
 
 import org.tasks.R;
@@ -159,14 +158,12 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
             case ITEM:
                 populateItem(viewHolder);
 
-                Filter selected = null;
                 if (activity instanceof TaskListActivity) {
-                    TaskListFragment tlf = ((TaskListActivity) activity).getTaskListFragment();
-                    selected = tlf.getFilter();
-                }
+                    Filter selected = ((TaskListActivity) activity).getCurrentFilter();
 
-                if (selected != null && selected.equals(viewHolder.item)) {
-                    convertView.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
+                    if (selected != null && selected.equals(viewHolder.item)) {
+                        convertView.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
+                    }
                 }
                 break;
             case SUBHEADER: