From 0e433e75fee675beff720acca27da04e6e72abad Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 7 Nov 2014 17:05:20 -0600
Subject: [PATCH] Remove FilterModeSpec

---
 .../astrid/activity/DefaultFilterMode.java    | 19 ------------
 .../astrid/activity/FilterModeSpec.java       | 13 ---------
 .../astrid/activity/TaskListActivity.java     | 29 ++-----------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java
 delete mode 100644 astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java
deleted file mode 100644
index aeaab95e9..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.todoroo.astrid.activity;
-
-import android.content.Context;
-
-import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.core.CoreFilterExposer;
-
-public class DefaultFilterMode implements FilterModeSpec {
-
-    @Override
-    public Class<? extends FilterListFragment> getFilterListClass() {
-        return FilterListFragment.class;
-    }
-
-    @Override
-    public Filter getDefaultFilter(Context context) {
-        return CoreFilterExposer.buildInboxFilter(context.getResources());
-    }
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java
deleted file mode 100644
index ff8b808eb..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.todoroo.astrid.activity;
-
-import android.content.Context;
-
-import com.todoroo.astrid.api.Filter;
-
-
-public interface FilterModeSpec {
-
-    public Class<? extends FilterListFragment> getFilterListClass();
-    public Filter getDefaultFilter(Context context);
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 94db24622..502879a3a 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -74,13 +74,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
 
     public static final String OPEN_TASK = "openTask"; //$NON-NLS-1$
 
-    private static final String FILTER_MODE = "filterMode"; //$NON-NLS-1$
-
-    public static final int FILTER_MODE_NORMAL = 0;
-
-    private int filterMode;
-    private FilterModeSpec filterModeSpec;
-
     /**
      * @see android.app.Activity#onCreate(Bundle)
      */
@@ -179,21 +172,11 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
     }
 
     protected Filter getDefaultFilter() {
-        return filterModeSpec.getDefaultFilter(this);
-    }
-
-    @Override
-    protected Bundle configureIntentAndExtrasWithFilter(Intent intent,
-            Filter filter) {
-        Bundle extras = super.configureIntentAndExtrasWithFilter(intent, filter);
-        getIntent().putExtra(FILTER_MODE, filterMode);
-        return extras;
+        return CoreFilterExposer.buildInboxFilter(getResources());
     }
 
     protected void initializeFragments() {
         View editFragment = findViewById(R.id.taskedit_fragment_container);
-        filterMode = getIntent().getIntExtra(FILTER_MODE, FILTER_MODE_NORMAL);
-        updateFilterModeSpec(filterMode);
 
         if(editFragment != null) {
             fragmentLayout = LAYOUT_DOUBLE;
@@ -202,7 +185,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
         }
 
         setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
-                filterModeSpec.getFilterListClass()));
+                FilterListFragment.class));
     }
 
     private void setupPopoverWithFragment(Fragment frag) {
@@ -547,14 +530,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
         }
     }
 
-    private void updateFilterModeSpec(int mode) {
-        switch(mode) {
-        case FILTER_MODE_NORMAL:
-        default:
-            filterModeSpec = new DefaultFilterMode();
-        }
-    }
-
     private void hideKeyboard() {
         TaskListFragment tlf = getTaskListFragment();
         if (tlf == null)