diff --git a/api/src/main/java/com/todoroo/andlib/data/package-info.java b/api/src/main/java/com/todoroo/andlib/data/package-info.java deleted file mode 100644 index cc5ad6d8f..000000000 --- a/api/src/main/java/com/todoroo/andlib/data/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Todoroo Library classes for the data layer: accessing data from a database or - * ContentResolver - */ -package com.todoroo.andlib.data; diff --git a/api/src/main/java/com/todoroo/andlib/service/package-info.java b/api/src/main/java/com/todoroo/andlib/service/package-info.java deleted file mode 100644 index 3392896b0..000000000 --- a/api/src/main/java/com/todoroo/andlib/service/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Todoroo Library classes for the service layer: dependency injection, - * exceptions, HTTP requests, etc. - */ -package com.todoroo.andlib.service; diff --git a/api/src/main/java/com/todoroo/andlib/sql/package-info.java b/api/src/main/java/com/todoroo/andlib/sql/package-info.java deleted file mode 100644 index e647fcf38..000000000 --- a/api/src/main/java/com/todoroo/andlib/sql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Fork of sql-dsl - */ -package com.todoroo.andlib.sql; diff --git a/api/src/main/java/com/todoroo/andlib/utility/package-info.java b/api/src/main/java/com/todoroo/andlib/utility/package-info.java deleted file mode 100644 index 25441d72d..000000000 --- a/api/src/main/java/com/todoroo/andlib/utility/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Todoroo Library utility classes - */ -package com.todoroo.andlib.utility; diff --git a/api/src/main/java/com/todoroo/astrid/api/package-info.java b/api/src/main/java/com/todoroo/astrid/api/package-info.java deleted file mode 100644 index 9f7bf2117..000000000 --- a/api/src/main/java/com/todoroo/astrid/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Astrid API constants and container packages - */ -package com.todoroo.astrid.api; diff --git a/api/src/main/java/com/todoroo/astrid/data/package-info.java b/api/src/main/java/com/todoroo/astrid/data/package-info.java deleted file mode 100644 index 9205a2000..000000000 --- a/api/src/main/java/com/todoroo/astrid/data/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Astrid data model classes and ContentResolver data access objects - */ -package com.todoroo.astrid.data; diff --git a/api/src/main/java/com/todoroo/astrid/sync/package-info.java b/api/src/main/java/com/todoroo/astrid/sync/package-info.java deleted file mode 100644 index 17b0bd67d..000000000 --- a/api/src/main/java/com/todoroo/astrid/sync/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Astrid synchronization helpers - */ -package com.todoroo.astrid.sync; diff --git a/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java b/astrid/src/androidTest/java/com/todoroo/andlib/service/AbstractDependencyInjector.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java rename to astrid/src/androidTest/java/com/todoroo/andlib/service/AbstractDependencyInjector.java diff --git a/api/src/main/java/com/todoroo/andlib/service/Autowired.java b/astrid/src/androidTest/java/com/todoroo/andlib/service/Autowired.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/service/Autowired.java rename to astrid/src/androidTest/java/com/todoroo/andlib/service/Autowired.java diff --git a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java b/astrid/src/androidTest/java/com/todoroo/andlib/service/DependencyInjectionService.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java rename to astrid/src/androidTest/java/com/todoroo/andlib/service/DependencyInjectionService.java diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java index 8af8ef979..a5129a5ad 100644 --- a/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java +++ b/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java @@ -9,9 +9,9 @@ import android.content.res.Configuration; import android.test.AndroidTestCase; import android.util.DisplayMetrics; +import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.astrid.service.AstridDependencyInjector; import java.util.Locale; diff --git a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/androidTest/java/com/todoroo/astrid/service/AstridDependencyInjector.java similarity index 93% rename from astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java rename to astrid/src/androidTest/java/com/todoroo/astrid/service/AstridDependencyInjector.java index 52a28efb7..a876be6a2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -26,27 +26,36 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncV2Provider; import com.todoroo.astrid.tags.TagService; import org.tasks.Broadcaster; -import org.tasks.injection.TasksModule; import org.tasks.filters.FilterCounter; import org.tasks.injection.Injector; +import org.tasks.injection.TasksModule; import org.tasks.scheduling.RefreshScheduler; import org.tasks.widget.WidgetHelper; import javax.inject.Inject; +import dagger.Module; import dagger.ObjectGraph; /** * Astrid application dependency injector loads classes in Astrid with the * appropriate instantiated objects necessary for their operation. For - * more information on Dependency Injection, see {@link DependencyInjectionService} - * and {@link AbstractDependencyInjector}. + * more information on Dependency Injection, see {@link com.todoroo.andlib.service.DependencyInjectionService} + * and {@link com.todoroo.andlib.service.AbstractDependencyInjector}. * * @author Tim Su * */ public class AstridDependencyInjector extends AbstractDependencyInjector { + @Module( + injects = { + AstridDependencyInjector.class + } + ) + public static class TestModule { + } + /** * Boolean bit to prevent multiple copies of this injector to be loaded */ @@ -97,7 +106,7 @@ public class AstridDependencyInjector extends AbstractDependencyInjector { .inject(caller); } }; - injector.inject(this); + injector.inject(this, new TestModule()); // com.todoroo.astrid.dao injectables.put("database", database); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java index a8849f41f..3ef3d2352 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java @@ -9,7 +9,6 @@ import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.test.TodorooTestCaseWithInjector; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.provider.Astrid3ContentProvider; -import com.todoroo.astrid.service.AstridDependencyInjector; /** * Test case that automatically sets up and tears down a test database @@ -19,10 +18,6 @@ import com.todoroo.astrid.service.AstridDependencyInjector; */ public class DatabaseTestCase extends TodorooTestCaseWithInjector { - static { - AstridDependencyInjector.initialize(); - } - public static Database database = new TestDatabase(); @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index 607ad9af6..6d063b99d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -6,11 +6,8 @@ package com.todoroo.astrid.actfm; import android.app.Activity; -import android.content.BroadcastReceiver; import android.content.ComponentName; -import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; @@ -19,17 +16,12 @@ import android.view.ViewGroup; import android.widget.TextView; import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.ContextManager; -import com.todoroo.andlib.service.NotificationManager; -import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager; import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.dao.TagDataDao; @@ -46,8 +38,6 @@ import javax.inject.Inject; public class TagViewFragment extends TaskListFragment { - public static final String BROADCAST_TAG_ACTIVITY = AstridApiConstants.API_PACKAGE + ".TAG_ACTIVITY"; //$NON-NLS-1$ - public static final String EXTRA_TAG_NAME = "tag"; //$NON-NLS-1$ @Deprecated @@ -200,34 +190,6 @@ public class TagViewFragment extends TaskListFragment { } } - // --- receivers - - private final BroadcastReceiver notifyReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if(!intent.hasExtra("tag_id")) { - return; - } - if(tagData == null || !tagData.getUUID().equals(intent.getStringExtra("tag_id"))) { - return; - } - - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - //refreshUpdatesList(); - } - }); - - NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext()); - try { - nm.cancel(Integer.parseInt(tagData.getUUID())); - } catch (NumberFormatException e) { - // Eh - } - } - }; - @Override public void onResume() { if (justDeleted) { @@ -243,17 +205,6 @@ public class TagViewFragment extends TaskListFragment { return; } super.onResume(); - - - IntentFilter intentFilter = new IntentFilter(BROADCAST_TAG_ACTIVITY); - getActivity().registerReceiver(notifyReceiver, intentFilter); - } - - @Override - public void onPause() { - super.onPause(); - - AndroidUtilities.tryUnregisterReceiver(getActivity(), notifyReceiver); } protected void reloadTagData() { diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java index ad34a7986..9e39366aa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java @@ -10,7 +10,6 @@ import android.content.Context; import android.content.Intent; import com.todoroo.andlib.service.ContextManager; -import com.todoroo.astrid.service.AstridDependencyInjector; public class BackupStartupReceiver extends BroadcastReceiver { diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java index c4eacb54d..18f105f89 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java @@ -10,7 +10,6 @@ import android.content.Context; import android.content.Intent; import com.todoroo.andlib.service.ContextManager; -import com.todoroo.astrid.service.AstridDependencyInjector; /** * Service which handles jobs that need to be run when phone boots diff --git a/astrid/src/main/java/org/tasks/injection/TasksModule.java b/astrid/src/main/java/org/tasks/injection/TasksModule.java index cfedf5c3f..8afcd789c 100644 --- a/astrid/src/main/java/org/tasks/injection/TasksModule.java +++ b/astrid/src/main/java/org/tasks/injection/TasksModule.java @@ -8,7 +8,6 @@ import com.todoroo.astrid.core.CustomFilterExposer; import com.todoroo.astrid.files.FilesControlSet; import com.todoroo.astrid.gcal.GCalControlSet; import com.todoroo.astrid.gtasks.GtasksFilterExposer; -import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.tags.TagsControlSet; import com.todoroo.astrid.timers.TimerActionControlSet; @@ -22,7 +21,6 @@ import dagger.Module; @Module( injects = { - AstridDependencyInjector.class, ScrollableViewsFactory.class, QuickAddBar.class, EditTitleControlSet.class,