Fixing crashes, duplicated RTM list size count, reordering in addon service

astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java

@@ -24,8 +24,8 @@ import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.PropertyVisitor;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.sql.Criterion;
@@ -34,8 +34,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.legacy.LegacyImportance;
 import com.todoroo.astrid.legacy.LegacyRepeatInfo;
-import com.todoroo.astrid.legacy.LegacyTaskModel;
 import com.todoroo.astrid.legacy.LegacyRepeatInfo.LegacyRepeatInterval;
+import com.todoroo.astrid.legacy.LegacyTaskModel;
 import com.todoroo.astrid.model.Metadata;
 import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.rmilk.data.MilkTask;
@@ -149,7 +149,7 @@ public class TasksXmlImporter {
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if(progressDialog.isShowing())
+                    if(progressDialog != null && progressDialog.isShowing())
                         progressDialog.dismiss();
                     showSummary();
                 }

astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java

@@ -31,10 +31,8 @@ import com.todoroo.astrid.rmilk.data.MilkTask;
  */
 public class MilkFilterExposer extends BroadcastReceiver {
 
-    @SuppressWarnings("nls")
     private Filter filterFromList(Context context, ListContainer list) {
-        String listTitle = context.getString(R.string.rmilk_FEx_list_item).
+        String listTitle = list.name;
-            replace("$N", list.name).replace("$C", Integer.toString(list.count));
         String title = context.getString(R.string.rmilk_FEx_list_title, list.name);
         ContentValues values = new ContentValues();
         values.put(Metadata.KEY.name, MilkTask.METADATA_KEY);

astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java

@@ -56,7 +56,12 @@ public class RtmTask
 
   public enum Priority
   {
-    High, Medium, Low, None
+    High, Medium, Low, None;
+
+    public static Priority values(Integer value) {
+        value = Math.max(values().length - 1, value);
+        return values()[value];
+    }
   }
 
   public static String convertPriority(Priority priority)

astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java

@@ -36,21 +36,21 @@ import com.todoroo.astrid.common.SyncProvider;
 import com.todoroo.astrid.model.Metadata;
 import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.rmilk.MilkLoginActivity;
+import com.todoroo.astrid.rmilk.MilkLoginActivity.SyncLoginCallback;
 import com.todoroo.astrid.rmilk.MilkPreferences;
 import com.todoroo.astrid.rmilk.MilkUtilities;
-import com.todoroo.astrid.rmilk.MilkLoginActivity.SyncLoginCallback;
 import com.todoroo.astrid.rmilk.api.ApplicationInfo;
 import com.todoroo.astrid.rmilk.api.ServiceImpl;
 import com.todoroo.astrid.rmilk.api.ServiceInternalException;
+import com.todoroo.astrid.rmilk.api.data.RtmAuth.Perms;
 import com.todoroo.astrid.rmilk.api.data.RtmList;
 import com.todoroo.astrid.rmilk.api.data.RtmLists;
 import com.todoroo.astrid.rmilk.api.data.RtmTask;
+import com.todoroo.astrid.rmilk.api.data.RtmTask.Priority;
 import com.todoroo.astrid.rmilk.api.data.RtmTaskList;
 import com.todoroo.astrid.rmilk.api.data.RtmTaskNote;
 import com.todoroo.astrid.rmilk.api.data.RtmTaskSeries;
 import com.todoroo.astrid.rmilk.api.data.RtmTasks;
-import com.todoroo.astrid.rmilk.api.data.RtmAuth.Perms;
-import com.todoroo.astrid.rmilk.api.data.RtmTask.Priority;
 import com.todoroo.astrid.rmilk.data.MilkDataService;
 import com.todoroo.astrid.rmilk.data.MilkNote;
 import com.todoroo.astrid.service.AstridDependencyInjector;
@@ -424,7 +424,7 @@ public class RTMSyncProvider extends SyncProvider<RTMTaskContainer> {
                     taskId, local.task.getValue(Task.TITLE));
         if(shouldTransmit(local, Task.IMPORTANCE, remote))
             rtmService.tasks_setPriority(timeline, listId, taskSeriesId,
-                    taskId, Priority.values()[local.task.getValue(Task.IMPORTANCE)]);
+                    taskId, Priority.values(local.task.getValue(Task.IMPORTANCE)));
         if(shouldTransmit(local, Task.DUE_DATE, remote))
             rtmService.tasks_setDueDate(timeline, listId, taskSeriesId,
                     taskId, DateUtilities.unixtimeToDate(local.task.getValue(Task.DUE_DATE)),

astrid/res/values/strings-rmilk.xml

@@ -19,9 +19,6 @@
     <!-- filter category for RTM lists -->
     <string name="rmilk_FEx_list">Lists</string>
     
-    <!-- RTM list filter name ($N => list, $C => count) -->
-    <string name="rmilk_FEx_list_item">$N ($C)</string>
-    
     <!--  RTM list filter title (%s => list) -->
     <string name="rmilk_FEx_list_title">RTM List \'%s\'</string>
     

astrid/src/com/todoroo/astrid/service/AddOnService.java

@@ -232,16 +232,16 @@ public class AddOnService {
                 LOCALE_PACKAGE, "http://www.weloveastrid.com/store",
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_locale)).getBitmap());
 
-        list[2] = new AddOn(true, true, "Remember the Milk", null,
+        list[2] = new AddOn(true, true, "Producteev", null,
-                "Synchronize with Remember The Milk service.",
-                Constants.PACKAGE, "http://www.rmilk.com",
-                ((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_refresh)).getBitmap());
-
-        list[3] = new AddOn(true, true, "Producteev", null,
                 "Synchronize with Producteev service. Also changes Astrid's importance levels to stars.",
                 PRODUCTEEV_PACKAGE, "http://www.producteev.com",
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_producteev)).getBitmap());
 
+        list[3] = new AddOn(true, true, "Remember the Milk", null,
+                "Synchronize with Remember The Milk service.",
+                Constants.PACKAGE, "http://www.rmilk.com",
+                ((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_refresh)).getBitmap());
+
         return list;
     }
 }