Pre-initialize astrid dependency injector and context manager for Locale stuff

pull/14/head
Tim Su 16 years ago
parent 77bf55d6ad
commit f65812c0ca

@ -7,6 +7,7 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.service.AddOnService; import com.todoroo.astrid.service.AddOnService;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.service.TaskService;
@ -41,6 +42,10 @@ public final class PluginServices {
private static PluginServices instance; private static PluginServices instance;
static {
AstridDependencyInjector.initialize();
}
private PluginServices() { private PluginServices() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);
} }

@ -9,7 +9,7 @@ import android.util.Log;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.ShortcutActivity; import com.todoroo.astrid.activity.ShortcutActivity;
@ -17,7 +17,6 @@ import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.model.Task; import com.todoroo.astrid.model.Task;
import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.reminders.Notifications;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Preferences; import com.todoroo.astrid.utility.Preferences;
@ -29,9 +28,6 @@ import com.todoroo.astrid.utility.Preferences;
*/ */
public class LocaleReceiver extends BroadcastReceiver { public class LocaleReceiver extends BroadcastReceiver {
@Autowired
private TaskService taskService;
/** /**
* Create a preference key for storing / retrieving last interval time * Create a preference key for storing / retrieving last interval time
* @param filterTitle * @param filterTitle
@ -46,6 +42,8 @@ public class LocaleReceiver extends BroadcastReceiver {
@Override @Override
/** Called when the system is started up */ /** Called when the system is started up */
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
ContextManager.setContext(context);
try { try {
if (com.twofortyfouram.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) { if (com.twofortyfouram.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) {
if(!PluginServices.getAddOnService().hasLocalePlugin()) if(!PluginServices.getAddOnService().hasLocalePlugin())
@ -72,7 +70,7 @@ public class LocaleReceiver extends BroadcastReceiver {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);
Filter filter = new Filter(title, title, null, null); Filter filter = new Filter(title, title, null, null);
filter.sqlQuery = sql; filter.sqlQuery = sql;
TodorooCursor<Task> cursor = taskService.fetchFiltered(filter, null, Task.ID); TodorooCursor<Task> cursor = PluginServices.getTaskService().fetchFiltered(filter, null, Task.ID);
try { try {
if(cursor.getCount() == 0) if(cursor.getCount() == 0)
return; return;

Loading…
Cancel
Save