diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
index a4f0b26fe..160dc7f6f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
@@ -25,7 +25,7 @@ public class TagDetailExposer extends BroadcastReceiver {
return;
boolean extended = intent.getBooleanExtra(AstridApiConstants.EXTRAS_EXTENDED, false);
- String taskDetail = getTaskDetails(context, taskId, extended);
+ String taskDetail = getTaskDetails(taskId, extended);
if(taskDetail == null)
return;
@@ -38,7 +38,7 @@ public class TagDetailExposer extends BroadcastReceiver {
context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
}
- public String getTaskDetails(Context context, long id, boolean extended) {
+ public String getTaskDetails(long id, boolean extended) {
if(extended)
return null;
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 5f26a33d3..31ce8d9f5 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -517,17 +517,6 @@ to the plugin creator for fastest service.
Android Market
-
-
-
- Synchronizing your tasks...
-
-
- Synchronizing...
-
-
- Synchronization
-
diff --git a/astrid/res/values/strings-sync.xml b/astrid/res/values/strings-sync.xml
index fc42d4c05..586ddf1ae 100644
--- a/astrid/res/values/strings-sync.xml
+++ b/astrid/res/values/strings-sync.xml
@@ -2,70 +2,81 @@
-
-
-
- Status
-
-
- Not Logged In!
-
- Sync Ongoing...
-
- Last Sync: %s
-
- Failed On: %s
-
- Last Successful Sync: %s
-
- Never Synchronized!
+
+
+
+ Synchronizing your tasks...
+
+
+ Synchronizing...
+
+
+ Synchronization
-
- Options
+
+
+
+ Status
+
+
+ Not Logged In!
+
+ Sync Ongoing...
+
+ Last Sync: %s
+
+ Failed On: %s
+
+ Last Successful Sync: %s
+
+ Never Synchronized!
-
- Background Sync
-
- Background synchronization is disabled
-
- Currently set to: %s
-
-
- Wifi Only Setting
-
- Background synchronization only happens when on Wifi
-
- Background synchronization will always occur
-
-
- Actions
+
+ Options
-
- Synchronize Now!
-
- Log In & Synchronize!
-
-
- Log Out
-
- Clears all synchronization data
+
+ Background Sync
+
+ Background synchronization is disabled
+
+ Currently set to: %s
+
+
+ Wifi Only Setting
+
+ Background synchronization only happens when on Wifi
+
+ Background synchronization will always occur
+
+
+ Actions
-
- Log out / clear synchronization data?
-
-
-
- - disable
- - every fifteen minutes
- - every thirty minutes
- - every hour
- - every three hours
- - every six hours
- - every twelve hours
- - every day
- - every three days
- - every week
-
+
+ Synchronize Now!
+
+ Log In & Synchronize!
+
+
+ Log Out
+
+ Clears all synchronization data
+
+
+ Log out / clear synchronization data?
+
+
+
+ - disable
+ - every fifteen minutes
+ - every thirty minutes
+ - every hour
+ - every three hours
+ - every six hours
+ - every twelve hours
+ - every day
+ - every three days
+ - every week
+
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index b0d150f89..5f80c5887 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -448,6 +448,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
super.onPause();
unregisterReceiver(detailReceiver);
unregisterReceiver(refreshReceiver);
+ unregisterReceiver(syncActionReceiver);
backgroundTimer.cancel();
}
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 6ae5721e1..d99c1caed 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -48,9 +48,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.TaskAction;
import com.todoroo.astrid.api.TaskDecoration;
import com.todoroo.astrid.model.Task;
-import com.todoroo.astrid.notes.NoteDetailExposer;
-import com.todoroo.astrid.producteev.ProducteevDetailExposer;
-import com.todoroo.astrid.repeats.RepeatDetailExposer;
import com.todoroo.astrid.service.AddOnService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants;
diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java
index cd70f8c49..90515f6c1 100644
--- a/astrid/src/com/todoroo/astrid/service/AddOnService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java
@@ -234,9 +234,9 @@ public class AddOnService {
Constants.PACKAGE, "http://www.producteev.com",
((BitmapDrawable)r.getDrawable(R.drawable.icon_producteev)).getBitmap());
- list[3] = new AddOn(true, true, "Remember the Milk", null,
+ list[3] = new AddOn(true, false, "Remember the Milk", null,
"Synchronize with Remember The Milk service.",
- Constants.PACKAGE, "http://www.rmilk.com",
+ "org.weloveastrid.rmilk", "http://www.rmilk.com",
((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_refresh)).getBitmap());
return list;