diff --git a/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java index e17207a51..62d5694a4 100644 --- a/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java +++ b/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java @@ -170,9 +170,4 @@ public class NotificationTests extends DatabaseTestCase { .plus(new NotificationTestsModule()) .inject(this); } - - @Override - protected Object getModule() { - return new NotificationTestsModule(); - } } diff --git a/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/src/androidTest/java/org/tasks/injection/InjectingTestCase.java index 5da400b79..3e5c24245 100644 --- a/src/androidTest/java/org/tasks/injection/InjectingTestCase.java +++ b/src/androidTest/java/org/tasks/injection/InjectingTestCase.java @@ -13,16 +13,8 @@ public abstract class InjectingTestCase extends AndroidTestCase { TestComponent component = DaggerTestComponent.builder() .testModule(new TestModule(getContext())) .build(); - Object extension = getModule(); - if (extension != null) { -// objectGraph = objectGraph.plus(extension); - } inject(component); } protected abstract void inject(TestComponent component); - - protected Object getModule() { - return null; - } } diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java index 894c06f42..0401a9040 100644 --- a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java +++ b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java @@ -126,9 +126,4 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase { taskService.save(task); return task; } - - @Override - protected Object getModule() { - return new GtasksMetadataServiceTestModule(getContext()); - } } diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index 91b2fb90f..4a9a9dc39 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -22,6 +22,7 @@ import com.todoroo.astrid.sync.SyncResultCallback; import org.tasks.Broadcaster; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; +import org.tasks.injection.FragmentComponent; import org.tasks.preferences.ActivityPreferences; import org.tasks.sync.IndeterminateProgressBarSyncResultCallback; import org.tasks.sync.RecordSyncStatusCallback; @@ -108,4 +109,11 @@ public class GtasksListFragment extends SubtasksListFragment { public Property[] taskProperties() { return helper.taskProperties(); } + + @Override + public void inject(FragmentComponent component) { + super.inject(component); + + component.inject(this); + } } diff --git a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index 70c29c924..8fef8c7f2 100644 --- a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -13,6 +13,8 @@ import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; +import org.tasks.injection.FragmentComponent; + import javax.inject.Inject; public class TagViewFragment extends TaskListFragment { @@ -93,4 +95,11 @@ public class TagViewFragment extends TaskListFragment { protected boolean hasDraggableOption() { return tagData != null; } + + @Override + public void inject(FragmentComponent component) { + super.inject(component); + + component.inject(this); + } } diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index a9773d921..1ea3ad9de 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -24,6 +24,7 @@ import com.todoroo.astrid.service.TaskService; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.ForApplication; +import org.tasks.injection.FragmentComponent; import org.tasks.preferences.ActivityPreferences; import javax.inject.Inject; @@ -140,4 +141,11 @@ public class SubtasksListFragment extends TaskListFragment { protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); } + + @Override + public void inject(FragmentComponent component) { + super.inject(component); + + component.inject(this); + } } diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index dc6d5f517..bb442ce96 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -23,6 +23,7 @@ import com.todoroo.astrid.service.TaskService; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.ForApplication; +import org.tasks.injection.FragmentComponent; import org.tasks.preferences.ActivityPreferences; import javax.inject.Inject; @@ -110,4 +111,11 @@ public class SubtasksTagListFragment extends TagViewFragment { protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); } + + @Override + public void inject(FragmentComponent component) { + super.inject(component); + + component.inject(this); + } } diff --git a/src/main/java/org/tasks/injection/FragmentComponent.java b/src/main/java/org/tasks/injection/FragmentComponent.java index 8344a8b81..13bb276d9 100644 --- a/src/main/java/org/tasks/injection/FragmentComponent.java +++ b/src/main/java/org/tasks/injection/FragmentComponent.java @@ -1,9 +1,13 @@ package org.tasks.injection; +import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.activity.TaskEditFragment; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.files.FilesControlSet; +import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.repeats.RepeatControlSet; +import com.todoroo.astrid.subtasks.SubtasksListFragment; +import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.tags.TagsControlSet; import com.todoroo.astrid.timers.TimerControlSet; import com.todoroo.astrid.ui.EditTitleControlSet; @@ -54,4 +58,12 @@ public interface FragmentComponent { void inject(CalendarControlSet calendarControlSet); void inject(TaskListFragment taskListFragment); + + void inject(TagViewFragment tagViewFragment); + + void inject(GtasksListFragment gtasksListFragment); + + void inject(SubtasksListFragment subtasksListFragment); + + void inject(SubtasksTagListFragment subtasksTagListFragment); }