From 175543d494fe3ffcd85066859e0bb8d231932db8 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Mon, 16 Aug 2010 15:13:36 -0700 Subject: [PATCH] Fixing crashes, duplicated RTM list size count, reordering in addon service --- .../com/todoroo/astrid/backup/TasksXmlImporter.java | 6 +++--- .../com/todoroo/astrid/rmilk/MilkFilterExposer.java | 4 +--- .../com/todoroo/astrid/rmilk/api/data/RtmTask.java | 7 ++++++- .../todoroo/astrid/rmilk/sync/RTMSyncProvider.java | 8 ++++---- astrid/res/values/strings-rmilk.xml | 3 --- .../src/com/todoroo/astrid/service/AddOnService.java | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java index da8dea146..3409da542 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/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(); } diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java index 4248fa486..3075acae7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkFilterExposer.java +++ b/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). - replace("$N", list.name).replace("$C", Integer.toString(list.count)); + String listTitle = list.name; String title = context.getString(R.string.rmilk_FEx_list_title, list.name); ContentValues values = new ContentValues(); values.put(Metadata.KEY.name, MilkTask.METADATA_KEY); diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java index 48553c5b6..fe3161cb0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java +++ b/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) diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java index b9c38e30d..296164e0d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java +++ b/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 { 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)), diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml index 1724c50fb..46be525af 100644 --- a/astrid/res/values/strings-rmilk.xml +++ b/astrid/res/values/strings-rmilk.xml @@ -19,9 +19,6 @@ Lists - - $N ($C) - RTM List \'%s\' diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index bce741857..d002293d8 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/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, - "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, + list[2] = 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; } }