Clean up injections

10 years ago · fa6060a40c
parent 2717390429
commit fa6060a40c
14 changed files with 70 additions and 83 deletions
--- a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
+++ b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
@ -1,10 +1,13 @@
 package com.todoroo.astrid.subtasks;

+import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.CoreFilterExposer;
+import com.todoroo.astrid.dao.TaskListMetadataDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskListMetadata;
+import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node;
 import com.todoroo.astrid.test.DatabaseTestCase;

@ -15,6 +18,9 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 */
 public class SubtasksTestCase extends DatabaseTestCase {

+    @Autowired TaskListMetadataDao taskListMetadataDao;
+    @Autowired TaskService taskService;
+
    protected SubtasksUpdater<TaskListMetadata> updater;
    protected Filter filter;

@ -34,7 +40,7 @@ public class SubtasksTestCase extends DatabaseTestCase {
        super.setUp();
        filter = CoreFilterExposer.buildInboxFilter(getContext().getResources());
        Preferences.clear(SubtasksUpdater.ACTIVE_TASKS_ORDER);
-        updater = new SubtasksFilterUpdater();
+        updater = new SubtasksFilterUpdater(taskListMetadataDao, taskService);
    }

    protected void expectParentAndPosition(Task task, Task parent, int positionInParent) {
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
@ -42,8 +42,6 @@ import com.todoroo.astrid.utility.Flags;

 import org.tasks.R;

-import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.inject.Inject;

 public class TagViewFragment extends TaskListFragment {
@ -72,8 +70,6 @@ public class TagViewFragment extends TaskListFragment {

    private boolean dataLoaded = false;

-    protected AtomicBoolean isBeingFiltered = new AtomicBoolean(false);
-
    protected boolean justDeleted = false;

    // --- UI initialization
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@ -72,6 +72,7 @@ import com.todoroo.astrid.helper.TaskListContextMenuExtensionLoader;
 import com.todoroo.astrid.helper.TaskListContextMenuExtensionLoader.ContextMenuItem;
 import com.todoroo.astrid.reminders.MakeNotification;
 import com.todoroo.astrid.reminders.WhenReminder;
+import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.UpgradeService;
 import com.todoroo.astrid.subtasks.SubtasksHelper;
@ -141,9 +142,10 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel

    // --- instance variables

-    @Inject protected TaskService taskService;
+    @Inject TaskService taskService;
    @Inject UpgradeService upgradeService;
    @Inject TaskListMetadataDao taskListMetadataDao;
+    @Inject SyncV2Service syncService;

    private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[] {
            new MakeNotification(),
@ -282,7 +284,7 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
        // We have a menu item to show in action bar.
        resources = getResources();
        setHasOptionsMenu(true);
-        syncActionHelper = new SyncActionHelper(getActivity(), this);
+        syncActionHelper = new SyncActionHelper(syncService, getActivity(), this);
        setUpUiComponents();
        initializeData();
        setupQuickAddBar();
--- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
@ -23,6 +23,7 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
 import com.todoroo.astrid.service.SyncV2Service;
+import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
 import com.todoroo.astrid.subtasks.OrderedMetadataListFragmentHelper;
 import com.todoroo.astrid.subtasks.SubtasksListFragment;
@ -35,6 +36,7 @@ public class GtasksListFragment extends SubtasksListFragment {

    public static final String TOKEN_STORE_ID = "storeId"; //$NON-NLS-1$

+    @Inject TaskService taskService;
    @Inject StoreObjectDao storeObjectDao;
    @Inject GtasksTaskListUpdater gtasksTaskListUpdater;
    @Inject GtasksMetadataService gtasksMetadataService;
--- a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java
+++ b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java
@ -18,9 +18,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.widget.ArrayAdapter;

-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
@ -67,13 +65,12 @@ public class SyncActionHelper {

    protected SyncActionReceiver syncActionReceiver = new SyncActionReceiver();

-    @Autowired SyncV2Service syncService;
+    private final SyncV2Service syncService;

    // --- boilerplate

-    public SyncActionHelper(Activity activity, Fragment fragment) {
-        DependencyInjectionService.getInstance().inject(this);
-
+    public SyncActionHelper(SyncV2Service syncService, Activity activity, Fragment fragment) {
+        this.syncService = syncService;
        this.activity = activity;
        this.fragment = fragment;
        syncResultCallback = new ProgressBarSyncResultCallback(activity, fragment,
--- a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java
@ -24,12 +24,15 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.repeats.RepeatControlSet;
+import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.ui.NumberPicker;

 import org.tasks.R;

 import java.util.Date;

+import javax.inject.Inject;
+
 import static org.tasks.date.DateTimeUtils.newDate;

 /**
@ -48,6 +51,8 @@ public class NotificationFragment extends TaskListFragment {

    // --- implementation

+    @Inject TaskService taskService;
+
    @Override
    protected void initializeData() {
        displayNotificationPopup();
@ -63,7 +68,7 @@ public class NotificationFragment extends TaskListFragment {

        String title = extras.getString(Notifications.EXTRAS_TEXT);
        long taskId = extras.getLong(TOKEN_ID);
-        new ReminderDialog((AstridActivity) getActivity(), taskId, title).show();
+        new ReminderDialog(taskService, (AstridActivity) getActivity(), taskId, title).show();
    }

    public static class SnoozeDialog extends FrameLayout implements DialogInterface.OnClickListener {
--- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java
@ -14,8 +14,6 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;

-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
@ -37,12 +35,10 @@ import static org.tasks.date.DateTimeUtils.newDate;
 */
 public class ReminderDialog extends Dialog {

-    @Autowired private TaskService taskService;
-
-    public ReminderDialog(final AstridActivity activity, final long taskId,
+    public ReminderDialog(final TaskService taskService, final AstridActivity activity, final long taskId,
            String title) {
        super(activity, R.style.ReminderDialog);
-        DependencyInjectionService.getInstance().inject(this);
+
        final SnoozeCallback dialogSnooze = new SnoozeCallback() {
            @Override
            public void snoozeForTime(long time) {
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@ -14,8 +14,6 @@ import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
 import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Query;
@ -47,15 +45,14 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
    private final DisplayMetrics metrics = new DisplayMetrics();
    private final AstridOrderedListUpdater<LIST> updater;
    private final TaskListFragment fragment;
-
-    @Autowired TaskService taskService;
+    private final TaskService taskService;

    private DraggableTaskAdapter taskAdapter;

    private LIST list;

-    public AstridOrderedListFragmentHelper(TaskListFragment fragment, AstridOrderedListUpdater<LIST> updater) {
-        DependencyInjectionService.getInstance().inject(this);
+    public AstridOrderedListFragmentHelper(TaskService taskService, TaskListFragment fragment, AstridOrderedListUpdater<LIST> updater) {
+        this.taskService = taskService;
        this.fragment = fragment;
        this.updater = updater;
    }
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
@ -3,8 +3,6 @@ package com.todoroo.astrid.subtasks;
 import android.util.Log;

 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
@ -21,10 +19,10 @@ import java.util.Set;

 public abstract class AstridOrderedListUpdater<LIST> {

-    @Autowired private TaskService taskService;
+    private final TaskService taskService;

-    public AstridOrderedListUpdater() {
-        DependencyInjectionService.getInstance().inject(this);
+    public AstridOrderedListUpdater(TaskService taskService) {
+        this.taskService = taskService;
        idToNode = new HashMap<>();
    }

--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java
@ -3,12 +3,22 @@ package com.todoroo.astrid.subtasks;
 import android.text.TextUtils;

 import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.dao.TaskListMetadataDao;
 import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.TaskListMetadata;
+import com.todoroo.astrid.service.TaskService;
+
+import javax.inject.Inject;

 public class SubtasksFilterUpdater extends SubtasksUpdater<TaskListMetadata> {

-    public SubtasksFilterUpdater() {
+    private TaskListMetadataDao taskListMetadataDao;
+
+    @Inject
+    public SubtasksFilterUpdater(TaskListMetadataDao taskListMetadataDao, TaskService taskService) {
+        super(taskService);
+
+        this.taskListMetadataDao = taskListMetadataDao;
    }

    @Override
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
@ -5,7 +5,7 @@
 */
 package com.todoroo.astrid.subtasks;

-import android.os.Bundle;
+import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;

@ -14,9 +14,12 @@ import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskListMetadata;
+import com.todoroo.astrid.service.TaskService;

 import org.tasks.R;

+import javax.inject.Inject;
+
 /**
 * Fragment for subtasks
 *
@ -29,14 +32,18 @@ public class SubtasksListFragment extends TaskListFragment {

    private int lastVisibleIndex = -1;

+    @Inject TaskService taskService;
+    @Inject SubtasksFilterUpdater subtasksFilterUpdater;
+
    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
        helper = createFragmentHelper();
-        super.onActivityCreated(savedInstanceState);
    }

    protected OrderedListFragmentHelperInterface<?> createFragmentHelper() {
-        return new AstridOrderedListFragmentHelper<>(this, new SubtasksFilterUpdater());
+        return new AstridOrderedListFragmentHelper<>(taskService, this, subtasksFilterUpdater);
    }

    @Override
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
@ -5,6 +5,7 @@
 */
 package com.todoroo.astrid.subtasks;

+import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;

@ -13,18 +14,26 @@ import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskListMetadata;
+import com.todoroo.astrid.service.TaskService;

 import org.tasks.R;

+import javax.inject.Inject;
+
 public class SubtasksTagListFragment extends TagViewFragment {

-    private final AstridOrderedListFragmentHelper<TaskListMetadata> helper;
+    @Inject TaskService taskService;
+    @Inject SubtasksFilterUpdater subtasksFilterUpdater;
+
+    private AstridOrderedListFragmentHelper<TaskListMetadata> helper;

    private int lastVisibleIndex = -1;

-    public SubtasksTagListFragment() {
-        super();
-        helper = new AstridOrderedListFragmentHelper<>(this, new SubtasksTagUpdater(isBeingFiltered));
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        helper = new AstridOrderedListFragmentHelper<>(taskService, this, subtasksFilterUpdater);
    }

    @Override
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java
@ -1,39 +0,0 @@
-package com.todoroo.astrid.subtasks;
-
-import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.data.TaskListMetadata;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class SubtasksTagUpdater extends SubtasksFilterUpdater {
-
-    private final AtomicBoolean isBeingFiltered;
-
-    public SubtasksTagUpdater(AtomicBoolean isBeingFiltered) {
-        this.isBeingFiltered = isBeingFiltered;
-    }
-
-    @Override
-    protected String getSerializedTree(TaskListMetadata list, Filter filter) {
-        if (isBeingFiltered.get()) {
-            return "[]"; //$NON-NLS-1$
-        }
-        return super.getSerializedTree(list, filter);
-    }
-
-    @Override
-    protected void writeSerialization(TaskListMetadata list, String serialized, boolean shouldQueueSync) {
-        if (!isBeingFiltered.get()) {
-            super.writeSerialization(list, serialized, shouldQueueSync);
-        }
-    }
-
-    @Override
-    public int getIndentForTask(String targetTaskId) {
-        if (isBeingFiltered.get()) {
-            return 0;
-        }
-        return super.getIndentForTask(targetTaskId);
-    }
-
-}
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java
@ -5,20 +5,21 @@
 */
 package com.todoroo.astrid.subtasks;

-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
-import com.todoroo.astrid.dao.TaskListMetadataDao;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.service.TaskService;

 public abstract class SubtasksUpdater<T> extends AstridOrderedListUpdater<T> {

-    @Autowired TaskListMetadataDao taskListMetadataDao;
-
    public static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$
    public static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$

+    public SubtasksUpdater(TaskService taskService) {
+        super(taskService);
+    }
+
    @Override
    public void initialize(T list, Filter filter) {
        super.initialize(list, filter);