From e2f8f77fd4324cad8139b79001f38800d5b93437 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 8 Jul 2011 17:02:35 -0700 Subject: [PATCH] If migration fails, stop sync. Also minor cleanup --- .../gtasks/api/GoogleTasksException.java | 4 ---- .../astrid/gtasks/api/GtasksService.java | 4 ++-- .../gtasks/sync/GtasksLegacyMigrator.java | 7 +------ .../gtasks/sync/GtasksSyncProvider.java | 21 +++++-------------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java index 9af472712..5bdaf4344 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java @@ -5,10 +5,6 @@ import java.io.IOException; public class GoogleTasksException extends IOException { private static final long serialVersionUID = -5585448790574862510L; - public GoogleTasksException() { - - } - public GoogleTasksException(String message) { super(message); } diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java index affb21e85..71c2ceefe 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksService.java @@ -23,9 +23,9 @@ import com.google.api.services.tasks.v1.model.TaskLists; public class GtasksService { private Tasks service; - private static final String API_KEY = "AIzaSyCIYZTBo6haRHxmiplZsfYdagFEpaiFnAk"; //Dummy + private static final String API_KEY = "AIzaSyCIYZTBo6haRHxmiplZsfYdagFEpaiFnAk"; // non-production API key - public static final String AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/tasks"; //$NON-NLS-1$ + public static final String AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/tasks"; public GtasksService(String authToken) { try { diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java index 382b15b77..dfbbc2a95 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java @@ -51,7 +51,7 @@ public class GtasksLegacyMigrator { this.allLists = allLists; } - public boolean checkAndMigrateLegacy() { + public void checkAndMigrateLegacy() throws IOException { if (!Preferences.getBoolean(MIGRATION_HAS_OCCURRED, false)) { listService.migrateListIds(allLists); @@ -65,8 +65,6 @@ public class GtasksLegacyMigrator { Query.select(Metadata.TASK).from(Metadata.TABLE). where(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY))))); - - try { if (allTasksWithGtaskData.getCount() > 0) { //Fetch all remote tasks from all remote lists (this may be an expensive operation) @@ -112,14 +110,11 @@ public class GtasksLegacyMigrator { if (defaultListId == null) defaultListId = "@default"; //$NON-NLS-1$ Preferences.setString(GtasksPreferenceService.PREF_DEFAULT_LIST, defaultListId); } - } catch (IOException e) { - return false; } finally { allTasksWithGtaskData.close(); } Preferences.setBoolean(MIGRATION_HAS_OCCURRED, true); //Record successful migration } - return true; } private String constructKeyFromTitles(String taskTitle, String listTitle) { diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java index b9d03defe..5b645f476 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -165,8 +165,8 @@ public class GtasksSyncProvider extends SyncProvider { try { TaskLists allTaskLists = taskService.allGtaskLists(); - //TODO: do something with result of migration check? - new GtasksLegacyMigrator(taskService, gtasksListService, allTaskLists).checkAndMigrateLegacy(); + new GtasksLegacyMigrator(taskService, gtasksListService, + allTaskLists).checkAndMigrateLegacy(); getActiveList(allTaskLists); @@ -244,7 +244,7 @@ public class GtasksSyncProvider extends SyncProvider { localIdsToRemoteIds.put(task.task.getId(), task.gtaskMetadata.getValue(GtasksMetadata.ID)); } - verifyCreatedOrder(locals, localIdsToRemoteIds); + verifyCreatedOrder(localIdsToRemoteIds); for(GtasksTaskContainer remote : data.remoteUpdated) { if(remote.task.getId() < 1) { @@ -260,8 +260,7 @@ public class GtasksSyncProvider extends SyncProvider { super.readRemotelyUpdated(data); } - private void verifyCreatedOrder(HashMap locals, - HashMap localIdsToRemoteIds) throws IOException { + private void verifyCreatedOrder(HashMap localIdsToRemoteIds) throws IOException { for (GtasksTaskContainer t : createdWithoutParent) { String toMove = t.gtaskMetadata.getValue(GtasksMetadata.ID); String listId = t.gtaskMetadata.getValue(GtasksMetadata.LIST_ID); @@ -280,16 +279,7 @@ public class GtasksSyncProvider extends SyncProvider { // ---------------------------------------------------------------------- // all synchronized properties - private static final Property[] PROPERTIES = new Property[] { - Task.ID, - Task.TITLE, - Task.DUE_DATE, - Task.CREATION_DATE, - Task.COMPLETION_DATE, - Task.DELETION_DATE, - Task.REMINDER_FLAGS, - Task.NOTES, - }; + private static final Property[] PROPERTIES = Task.PROPERTIES; /** * Populate SyncData data structure @@ -351,7 +341,6 @@ public class GtasksSyncProvider extends SyncProvider { if (remoteTasks != null) { int order = 0; - //HashMap> children = new HashMap>(); HashMap idsToTasks = new HashMap(); HashMap indentation = new HashMap(); HashMap parentToPriorSiblingMap = new HashMap();