From 486d675384bbd7bb539ac3d8857e3d9e26e8cce2 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 30 Sep 2010 15:59:08 -0700 Subject: [PATCH] Now we actually execute batcehd actions, as well as get task lists one at a time (previously no tasks were able to be returned) --- astrid/libs/todoroo-g.jar | Bin 30950 -> 30874 bytes .../gtasks/sync/GtasksSyncProvider.java | 28 +++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/astrid/libs/todoroo-g.jar b/astrid/libs/todoroo-g.jar index a415f05d41417c18584d488d042c2aeac805ceef..9f87afc6606774b6be52b567ed94730220ea7259 100644 GIT binary patch delta 7774 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 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 fb81f914f..4a199cff6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import org.json.JSONException; @@ -50,13 +51,12 @@ import com.todoroo.astrid.utility.Constants; import com.todoroo.gtasks.GoogleConnectionManager; import com.todoroo.gtasks.GoogleLoginException; import com.todoroo.gtasks.GoogleTaskService; -import com.todoroo.gtasks.GoogleTaskService.ConvenientTaskCreator; import com.todoroo.gtasks.GoogleTaskTask; import com.todoroo.gtasks.GoogleTaskView; import com.todoroo.gtasks.GoogleTasksException; +import com.todoroo.gtasks.GoogleTaskService.ConvenientTaskCreator; import com.todoroo.gtasks.actions.Action; import com.todoroo.gtasks.actions.Actions; -import com.todoroo.gtasks.actions.GetTasksAction; import com.todoroo.gtasks.actions.ListAction; import com.todoroo.gtasks.actions.ListActions; import com.todoroo.gtasks.actions.ListActions.TaskBuilder; @@ -227,14 +227,10 @@ public class GtasksSyncProvider extends SyncProvider { // batched read tasks for each list ArrayList remoteTasks = new ArrayList(); - ArrayList getTasksActions = new ArrayList(); for(StoreObject dashboard : gtasksListService.getLists()) { String listId = dashboard.getValue(GtasksList.REMOTE_ID); - getTasksActions.add(a.getTasks(listId, true)); - } - taskService.executeActions(getTasksActions.toArray(new GetTasksAction[getTasksActions.size()])); - for(GetTasksAction action : getTasksActions) { - List list = action.getGoogleTasks(); + List list = taskService.getTasks(listId); + System.err.println("list " + listId + " read " + list.size() + " tasks"); readTasksIntoRemoteTasks(list, remoteTasks); } @@ -246,6 +242,7 @@ public class GtasksSyncProvider extends SyncProvider { syncData.localUpdated.close(); } + executeBatchedActions(); gtasksTaskListUpdater.updateAllMetadata(); gtasksPreferenceService.recordSuccessfulSync(); @@ -484,6 +481,21 @@ public class GtasksSyncProvider extends SyncProvider { actions.add(action); } + /** execute all batched actions */ + private void executeBatchedActions() throws IOException, JSONException { + if(!actions.isEmpty()) { + taskService.executeActions(actions.toArray(new Action[actions.size()])); + System.err.println("executed " + actions); + } + if(!listActions.isEmpty()) { + for(Entry> entry : listActions.entrySet()) { + taskService.executeListActions(entry.getKey(), + entry.getValue().toArray(new ListAction[entry.getValue().size()])); + System.err.println("executed " + entry.getValue() + " on " + entry.getKey()); + } + } + } + // ---------------------------------------------------------------------- // --------------------------------------------------------- read / write // ----------------------------------------------------------------------