From 14d4a26fb0ba90149c123d8bca30d6856c713c77 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 27 May 2014 09:21:20 -0500
Subject: [PATCH] Inject FilterAdapter

---
 .../astrid/activity/FilterListFragment.java      |  2 +-
 .../todoroo/astrid/adapter/FilterAdapter.java    | 16 +++++-----------
 astrid/src/main/java/org/tasks/TasksModule.java  |  4 +++-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java
index 20cd411dd..ce59892aa 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java
@@ -102,7 +102,7 @@ public class FilterListFragment extends ListFragment {
     }
 
     private FilterAdapter instantiateAdapter() {
-        return new FilterAdapter(getActivity(), R.layout.filter_adapter_row);
+        return new FilterAdapter(getActivity(), null, R.layout.filter_adapter_row, false, false);
     }
 
     /* (non-Javadoc)
diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index c11a0dc2a..3a93eff77 100644
--- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -30,9 +30,7 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.activity.TaskListFragment;
@@ -44,15 +42,17 @@ import com.todoroo.astrid.api.FilterCategoryWithNewButton;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.FilterWithUpdate;
-import com.todoroo.astrid.service.TaskService;
 
 import org.tasks.R;
 import org.tasks.filters.FilterCounter;
+import org.tasks.injection.Injector;
 
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 public class FilterAdapter extends ArrayAdapter<Filter> {
 
     // --- style constants
@@ -62,9 +62,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     // --- instance variables
 
-    @Autowired private TaskService taskService;
-
-    @Autowired private FilterCounter filterCounter;
+    @Inject FilterCounter filterCounter;
 
     /** parent activity */
     protected final Activity activity;
@@ -92,15 +90,11 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     /** whether rows are selectable */
     private final boolean selectable;
 
-    public FilterAdapter(Activity activity, int rowLayout) {
-        this(activity, null, rowLayout, false, false);
-    }
-
     public FilterAdapter(Activity activity, ListView listView,
             int rowLayout, boolean skipIntentFilters, boolean selectable) {
         super(activity, 0);
 
-        DependencyInjectionService.getInstance().inject(this);
+        ((Injector) activity.getApplication()).inject(this);
 
         this.activity = activity;
         this.listView = listView;
diff --git a/astrid/src/main/java/org/tasks/TasksModule.java b/astrid/src/main/java/org/tasks/TasksModule.java
index 0504e5c09..b1672b01b 100644
--- a/astrid/src/main/java/org/tasks/TasksModule.java
+++ b/astrid/src/main/java/org/tasks/TasksModule.java
@@ -1,12 +1,14 @@
 package org.tasks;
 
+import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
 import dagger.Module;
 
 @Module(
         injects = {
-                AstridDependencyInjector.class
+                AstridDependencyInjector.class,
+                FilterAdapter.class
         }
 )
 public class TasksModule {