Remove class instantiation, unnecessary injections

api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java

@@ -56,33 +56,7 @@ abstract public class AbstractDependencyInjector {
      * @return object to assign to this field, or null
      */
     public Object getInjection(Field field) {
-        return getInjection(field.getName());
-    }
-
-    public Object getInjection(String name) {
-        if(!injectables.containsKey(name)) {
-            return null;
-        }
-        Object injection = injectables.get(name);
-
-        // if it's a class, instantiate the class
-        if(injection instanceof Class<?>) {
-            if(createdObjects.containsKey(injection) &&
-                    createdObjects.get(injection).get() != null) {
-                injection = createdObjects.get(injection).get();
-            } else {
-                Class<?> cls = (Class<?>)injection;
-                try {
-                    injection = cls.newInstance();
-                } catch (IllegalAccessException | InstantiationException e) {
-                    throw new RuntimeException(e);
-                }
-
-                createdObjects.put(cls, new WeakReference<>(injection));
-            }
-        }
-
-        return injection;
+        return injectables.get(field.getName());
     }
 
     @Override

api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -18,7 +18,6 @@ import android.preference.PreferenceCategory;
 import android.view.View;
 import android.view.ViewGroup.OnHierarchyChangeListener;
 
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
@@ -72,10 +71,6 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
 
     private int statusColor = Color.BLACK;
 
-    public SyncProviderPreferences() {
-        DependencyInjectionService.getInstance().inject(this);
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -29,7 +29,6 @@ import android.widget.TextView;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.messages.NameMaps;
 import com.todoroo.astrid.data.RemoteModel;
@@ -81,7 +80,6 @@ public class UpdateAdapter extends CursorAdapter {
     public UpdateAdapter(Fragment fragment, int resource,
             Cursor c) {
         super(fragment.getActivity(), c, false);
-        DependencyInjectionService.getInstance().inject(this);
 
         inflater = (LayoutInflater) fragment.getActivity().getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);

astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java

@@ -13,7 +13,6 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.view.View;
 import android.view.ViewGroup.OnHierarchyChangeListener;
 
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
@@ -22,8 +21,6 @@ import com.todoroo.astrid.utility.Flags;
 
 import org.tasks.R;
 
-import java.util.Date;
-
 import static org.tasks.date.DateTimeUtils.newDate;
 
 /**
@@ -49,7 +46,6 @@ public class BackupPreferences extends TodorooPreferenceActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        DependencyInjectionService.getInstance().inject(this);
         getListView().setOnHierarchyChangeListener(new OnHierarchyChangeListener() {
 
             @Override

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java

@@ -20,7 +20,6 @@ import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.WeekdayNum;
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
@@ -47,7 +46,6 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
-        DependencyInjectionService.getInstance().inject(this);
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
         if(taskId == -1) {
             return;

astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java

@@ -12,14 +12,12 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.todoroo.andlib.data.Property.IntegerProperty;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.ui.NNumberPickerDialog.OnNNumberPickedListener;
 
 import org.tasks.R;
 
-public class TimeDurationControlSet implements OnNNumberPickedListener,
-        View.OnClickListener {
+public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnClickListener {
 
     private final Activity activity;
     private final TextView timeButton;
@@ -33,7 +31,6 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
 
     public TimeDurationControlSet(Activity activity, View view, IntegerProperty property,
             int timeButtonId, int prefixResource, int titleResource) {
-        DependencyInjectionService.getInstance().inject(this);
 
         this.activity = activity;
         this.prefixResource = prefixResource;

astrid/src/main/java/org/tasks/filters/FilterCounter.java

@@ -1,7 +1,6 @@
 package org.tasks.filters;
 
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
@@ -42,7 +41,6 @@ public class FilterCounter {
     FilterCounter(TaskDao taskDao, ExecutorService executorService) {
         this.taskDao = taskDao;
         this.executorService = executorService;
-        DependencyInjectionService.getInstance().inject(this);
     }
 
     public void refreshFilterCounts(final Runnable onComplete) {