archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Another test, this time for DI, and fixes for the things we found

Browse Source
pull/14/head
Tim Su 14 years ago
parent f51c3269e8
commit e1ba346364
9 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
astrid/build.xml
Unescape Escape View File

@ -99,7 +99,13 @@
<echo>====== context classes without setContext =====</echo>
<exec executable="sh">
<arg value="-c" />
<arg value="cd bin/source; grep -L '\(setContext\|DependencyInjectionService\)' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .`" />
<arg value="cd bin/source; grep -L '\(setContext\|DependencyInjectionService\)' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .` | grep -v '.*\(CriteriaExposer\|DetailExposer\|Plugin\).java$'" />
</exec>
<echo />
<echo>====== entry points without initializing Astrid DI =====</echo>
<exec executable="sh">
<arg value="-c" />
<arg value="cd bin/source; grep -L '\(AstridDependencyInjector\)' $(grep -l '@Autowired' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .`)" />
</exec>
</target>

2
astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
Unescape Escape View File

@ -10,6 +10,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.data.Task;
@ -19,6 +20,7 @@ public class GCalTaskCompleteListener extends BroadcastReceiver {
@SuppressWarnings("nls")
@Override
public void onReceive(Context context, Intent intent) {
ContextManager.setContext(context);
long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
if(taskId == -1)
return;

5
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.service.AstridDependencyInjector;
/**
* Exposes Task Details for Google TAsks:
@ -29,6 +30,10 @@ public class GtasksDetailExposer extends BroadcastReceiver {
@Autowired private GtasksListService gtasksListService;
@Autowired private GtasksPreferenceService gtasksPreferenceService;
static {
AstridDependencyInjector.initialize();
}
public GtasksDetailExposer() {
DependencyInjectionService.getInstance().inject(this);
}

5
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
Unescape Escape View File

@ -31,6 +31,7 @@ import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria;
import com.todoroo.astrid.data.StoreObject;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
import com.todoroo.astrid.service.AstridDependencyInjector;
/**
* Exposes filters based on lists
@ -43,6 +44,10 @@ public class GtasksFilterExposer extends BroadcastReceiver {
@Autowired private GtasksListService gtasksListService;
@Autowired private GtasksPreferenceService gtasksPreferenceService;
static {
AstridDependencyInjector.initialize();
}
private StoreObject[] lists;
public static Filter filterFromList(Context context, StoreObject list) {

5
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
Unescape Escape View File

@ -14,6 +14,7 @@ import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.SyncAction;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.sync.SyncBackgroundService;
/**
@ -24,6 +25,10 @@ public class GtasksSyncActionExposer extends BroadcastReceiver {
@Autowired private GtasksPreferenceService gtasksPreferenceService;
static {
AstridDependencyInjector.initialize();
}
@Override
public void onReceive(Context context, Intent intent) {
ContextManager.setContext(context);

5
astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
Unescape Escape View File

@ -47,6 +47,7 @@ import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.gtasks.GtasksBackgroundService;
import com.todoroo.astrid.gtasks.GtasksPreferenceService;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.sync.SyncBackgroundService;
import com.todoroo.gtasks.GoogleConnectionManager;
@ -65,6 +66,10 @@ public class GtasksLoginActivity extends Activity {
// --- ui initialization
static {
AstridDependencyInjector.initialize();
}
public GtasksLoginActivity() {
super();
DependencyInjectionService.getInstance().inject(this);

2
astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevSyncActionExposer.java
Unescape Escape View File

@ -9,6 +9,7 @@ import android.content.Context;
import android.content.Intent;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.SyncAction;
@ -20,6 +21,7 @@ public class ProducteevSyncActionExposer extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
ContextManager.setContext(context);
// if we aren't logged in, don't expose sync action
if(!ProducteevUtilities.INSTANCE.isLoggedIn())
return;

16
astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
Unescape Escape View File

@ -8,14 +8,18 @@ import java.util.HashMap;
import java.util.TreeSet;
import android.app.Activity;
import android.content.*;
import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.widget.EditText;
import android.widget.Toast;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService;
@ -29,6 +33,7 @@ import com.todoroo.astrid.api.FilterListHeader;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.tags.TagService.Tag;
/**
@ -141,8 +146,11 @@ public class TagFilterExposer extends BroadcastReceiver {
protected String tag;
@Autowired
public TagService tagService;
@Autowired public TagService tagService;
static {
AstridDependencyInjector.initialize();
}
protected TagActivity() {
DependencyInjectionService.getInstance().inject(this);

2
astrid/src-legacy/com/timsu/astrid/activities/TaskList.java
Unescape Escape View File

@ -23,6 +23,7 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.activity.TaskListActivity;
/**
@ -40,6 +41,7 @@ public class TaskList extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ContextManager.setContext(this);
launchTaskList(getIntent());
}

Write Preview
Loading…
Cancel
Save