From b42915966164e38d7a530a42045479135ba5124b Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 10 Feb 2012 14:55:19 -0800 Subject: [PATCH] Fixed some taskrabbit bugs, insert api keys in build script --- astrid/build.xml | 11 +++++++ .../astrid/taskrabbit/TaskRabbitActivity.java | 23 +++++++------- .../taskrabbit/TaskRabbitDataService.java | 30 +------------------ astrid/res/values/strings-intro.xml | 2 +- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/astrid/build.xml b/astrid/build.xml index 147b67d52..88b9f6689 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -114,6 +114,17 @@ + + + + + diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java index d6d0e0aa3..131a3d004 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java @@ -130,13 +130,13 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList /** Act.fm current user name */ public static final String TASK_RABBIT_TOKEN = "task_rabbit_token"; //$NON-NLS-1$ - public static final String TASK_RABBIT_URL = "http://www.taskrabbit.com"; //$NON-NLS-1$ - public static final String TASK_RABBIT_CLIENT_ID = "RZUDrMuGn9Q3dXeq4nL24bM6LZmMCi1CEGgfP4ND"; //$NON-NLS-1$ - public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "Va7FUIUTprsmyuwAq9eHSZvAgiRj8FVH1zeaM8Zt"; //$NON-NLS-1$ -// public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$ -// public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$ -// public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$ + private static final String TASK_RABBIT_POPOVER_PREF = "task_rabbit_popover"; //$NON-NLS-1$ + + // Non-production values + public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$ + public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$ + public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$ public static final String CITY_NAME = "task_rabbit_city_name"; //$NON-NLS-1$ private TaskRabbitTaskContainer taskRabbitTask; @@ -161,10 +161,12 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList } - public void showAddListPopover() { - ActionBar actionBar = getSupportActionBar(); - HelpInfoPopover.showPopover(this, actionBar.getCustomView().findViewById(R.id.menu_nav), R.string.help_popover_add_lists, null); + if (!Preferences.getBoolean(TASK_RABBIT_POPOVER_PREF, false)) { + ActionBar actionBar = getSupportActionBar(); + HelpInfoPopover.showPopover(this, actionBar.getCustomView().findViewById(R.id.menu_nav), R.string.help_popover_taskrabbit_type, null); + Preferences.setBoolean(TASK_RABBIT_POPOVER_PREF, true); + } } @@ -173,9 +175,6 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList super.onResume(); StatisticsService.sessionStart(this); populateFields(); - - - if(!isLoggedIn()) showAddListPopover(); } diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDataService.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDataService.java index b1607262c..ca5d72e22 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDataService.java @@ -29,7 +29,6 @@ import com.todoroo.astrid.notes.NoteMetadata; import com.todoroo.astrid.producteev.ProducteevUtilities; import com.todoroo.astrid.producteev.sync.ProducteevDashboard; import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.tags.TagService; public final class TaskRabbitDataService { @@ -150,34 +149,7 @@ public final class TaskRabbitDataService { task.metadata.add(task.trTask); // note we don't include note metadata, since we only receive deltas metadataService.synchronizeMetadata(task.task.getId(), task.metadata, - Criterion.or(MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY), - MetadataCriteria.withKey(TagService.KEY))); - } - - /** - * Reads a task and its metadata - * @param task - * @return - */ - public TaskRabbitTaskContainer readTaskAndMetadata(TodorooCursor taskCursor) { - Task task = new Task(taskCursor); - - // read tags, notes, etc - ArrayList metadata = new ArrayList(); - TodorooCursor metadataCursor = metadataService.query(Query.select(Metadata.PROPERTIES). - where(Criterion.and(MetadataCriteria.byTask(task.getId()), - Criterion.or(MetadataCriteria.withKey(TagService.KEY), - MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY), - MetadataCriteria.withKey(NoteMetadata.METADATA_KEY))))); - try { - for(metadataCursor.moveToFirst(); !metadataCursor.isAfterLast(); metadataCursor.moveToNext()) { - metadata.add(new Metadata(metadataCursor)); - } - } finally { - metadataCursor.close(); - } - - return new TaskRabbitTaskContainer(task, metadata.get(0)); + MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY)); } /** diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml index 5c9650efe..3ca0a7ae6 100644 --- a/astrid/res/values/strings-intro.xml +++ b/astrid/res/values/strings-intro.xml @@ -88,5 +88,5 @@ - Change your type here + Change the type of task