From cb6645704fed3782eccf6e9f6d3a9bfb84301dc8 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 25 Aug 2010 17:06:33 -0700
Subject: [PATCH] Fixed some warnings, moved translations into sync file, fixed
 an issue with leaking reciever

---
 .../todoroo/astrid/tags/TagDetailExposer.java |   4 +-
 astrid/res/values/strings-core.xml            |  11 --
 astrid/res/values/strings-sync.xml            | 131 ++++++++++--------
 .../astrid/activity/TaskListActivity.java     |   1 +
 .../todoroo/astrid/adapter/TaskAdapter.java   |   3 -
 .../todoroo/astrid/service/AddOnService.java  |   4 +-
 6 files changed, 76 insertions(+), 78 deletions(-)

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.
   <!-- Add-on Activity - menu item to visit android market -->
   <string name="AOA_visit_market">Android Market</string>
   
-  <!-- ========================================== SynchronizationProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synchronizing your tasks...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchronizing...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synchronization</string>
-  
   <!-- ====================================================== TasksWidget == -->
 
   <!-- Widget text when loading tasks -->
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 @@
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- ======================== SyncPreferences ========================== -->
-    
-    <!-- Status Group Label -->    
-    <string name="sync_SPr_group_status">Status</string>
-    
-    <!-- Sync Status: log in -->    
-    <string name="sync_status_loggedout">Not Logged In!</string>
-    <!-- Status: ongoing -->    
-    <string name="sync_status_ongoing">Sync Ongoing...</string>
-    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-    <string name="sync_status_success">Last Sync: %s</string>
-    <!-- Sync Status: error status (%s -> last attempted sync date) -->    
-    <string name="sync_status_failed">Failed On: %s</string>
-    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-    <string name="sync_status_failed_subtitle">Last Successful Sync: %s</string>
-    <!-- Sync Status: never sync'd -->    
-    <string name="sync_status_never">Never Synchronized!</string>
+  <!-- ========================================== SynchronizationProvider == -->
+          
+  <!-- Sync Notification: message when sync service active -->
+  <string name="SyP_progress">Synchronizing your tasks...</string>
+  
+  <!-- Sync Notification: toast when sync activated from activity -->
+  <string name="SyP_progress_toast">Synchronizing...</string>
+  
+  <!-- Sync Label: used in menu to denote synchronization -->
+  <string name="SyP_label">Synchronization</string>  
 
-    <!-- Options Group Label -->    
-    <string name="sync_SPr_group_options">Options</string>
+  <!-- ======================== SyncPreferences ========================== -->
+  
+  <!-- Status Group Label -->    
+  <string name="sync_SPr_group_status">Status</string>
+  
+  <!-- Sync Status: log in -->    
+  <string name="sync_status_loggedout">Not Logged In!</string>
+  <!-- Status: ongoing -->    
+  <string name="sync_status_ongoing">Sync Ongoing...</string>
+  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
+  <string name="sync_status_success">Last Sync: %s</string>
+  <!-- Sync Status: error status (%s -> last attempted sync date) -->    
+  <string name="sync_status_failed">Failed On: %s</string>
+  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
+  <string name="sync_status_failed_subtitle">Last Successful Sync: %s</string>
+  <!-- Sync Status: never sync'd -->    
+  <string name="sync_status_never">Never Synchronized!</string>
 
-    <!-- Preference: Synchronization Interval Title -->    
-    <string name="sync_SPr_interval_title">Background Sync</string>
-    <!-- Preference: Synchronization Interval Description (when disabled) -->
-    <string name="sync_SPr_interval_desc_disabled">Background synchronization is disabled</string>    
-    <!-- Preference: Synchronization Interval Description (%s => setting) -->
-    <string name="sync_SPr_interval_desc">Currently set to: %s</string>
-    
-    <!-- Preference: Background Wifi Title -->  
-    <string name="sync_SPr_bgwifi_title">Wifi Only Setting</string>    
-    <!-- Preference: Background Wifi Description (enabled) -->
-    <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>    
-    <!-- Preference: Background Wifi Description (disabled) -->
-    <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
-    
-    <!-- Actions Group Label  -->
-    <string name="sync_SPr_group_actions">Actions</string>
+  <!-- Options Group Label -->    
+  <string name="sync_SPr_group_options">Options</string>
 
-    <!-- Synchronize Now Button -->    
-    <string name="sync_SPr_sync">Synchronize Now!</string>
-    <!-- Synchronize Now Button if not logged in-->    
-    <string name="sync_SPr_sync_log_in">Log In &amp; Synchronize!</string>
-    
-    <!-- Sync: Clear Data Title -->
-    <string name="sync_SPr_forget">Log Out</string>
-    <!-- Sync: Clear Data Description -->
-    <string name="sync_SPr_forget_description">Clears all synchronization data</string>
+  <!-- Preference: Synchronization Interval Title -->    
+  <string name="sync_SPr_interval_title">Background Sync</string>
+  <!-- Preference: Synchronization Interval Description (when disabled) -->
+  <string name="sync_SPr_interval_desc_disabled">Background synchronization is disabled</string>    
+  <!-- Preference: Synchronization Interval Description (%s => setting) -->
+  <string name="sync_SPr_interval_desc">Currently set to: %s</string>
+  
+  <!-- Preference: Background Wifi Title -->  
+  <string name="sync_SPr_bgwifi_title">Wifi Only Setting</string>    
+  <!-- Preference: Background Wifi Description (enabled) -->
+  <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>    
+  <!-- Preference: Background Wifi Description (disabled) -->
+  <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
+  
+  <!-- Actions Group Label  -->
+  <string name="sync_SPr_group_actions">Actions</string>
 
-    <!-- confirmation dialog for sync log out -->
-    <string name="sync_forget_confirm">Log out / clear synchronization data?</string>
-    
-    <string-array name="sync_SPr_interval_entries">
-        <!-- rmilk_MPr_interval_entries: Synchronization Intervals -->
-        <item>disable</item>
-        <item>every fifteen minutes</item>
-        <item>every thirty minutes</item>
-        <item>every hour</item>
-        <item>every three hours</item>
-        <item>every six hours</item>
-        <item>every twelve hours</item>
-        <item>every day</item>
-        <item>every three days</item>
-        <item>every week</item>
-    </string-array>
+  <!-- Synchronize Now Button -->    
+  <string name="sync_SPr_sync">Synchronize Now!</string>
+  <!-- Synchronize Now Button if not logged in-->    
+  <string name="sync_SPr_sync_log_in">Log In &amp; Synchronize!</string>
+  
+  <!-- Sync: Clear Data Title -->
+  <string name="sync_SPr_forget">Log Out</string>
+  <!-- Sync: Clear Data Description -->
+  <string name="sync_SPr_forget_description">Clears all synchronization data</string>
+
+  <!-- confirmation dialog for sync log out -->
+  <string name="sync_forget_confirm">Log out / clear synchronization data?</string>
+  
+  <string-array name="sync_SPr_interval_entries">
+      <!-- rmilk_MPr_interval_entries: Synchronization Intervals -->
+      <item>disable</item>
+      <item>every fifteen minutes</item>
+      <item>every thirty minutes</item>
+      <item>every hour</item>
+      <item>every three hours</item>
+      <item>every six hours</item>
+      <item>every twelve hours</item>
+      <item>every day</item>
+      <item>every three days</item>
+      <item>every week</item>
+  </string-array>
             
 </resources>
 
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;