* Move dependency injector to test package
* Remove unused code
pull/189/head
Alex Baker 12 years ago
parent 4a992b35f1
commit 64d1700529

@ -1,5 +0,0 @@
/**
* Todoroo Library classes for the data layer: accessing data from a database or
* ContentResolver
*/
package com.todoroo.andlib.data;

@ -1,5 +0,0 @@
/**
* Todoroo Library classes for the service layer: dependency injection,
* exceptions, HTTP requests, etc.
*/
package com.todoroo.andlib.service;

@ -1,4 +0,0 @@
/**
* Fork of <a href="http://code.google.com/p/sql-dsl/">sql-dsl</a>
*/
package com.todoroo.andlib.sql;

@ -1,4 +0,0 @@
/**
* Todoroo Library utility classes
*/
package com.todoroo.andlib.utility;

@ -1,4 +0,0 @@
/**
* Astrid API constants and container packages
*/
package com.todoroo.astrid.api;

@ -1,4 +0,0 @@
/**
* Astrid data model classes and ContentResolver data access objects
*/
package com.todoroo.astrid.data;

@ -1,4 +0,0 @@
/**
* Astrid synchronization helpers
*/
package com.todoroo.astrid.sync;

@ -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;

@ -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 <tim@todoroo.com>
*
*/
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);

@ -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

@ -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() {

@ -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 {

@ -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

@ -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,

Loading…
Cancel
Save