diff --git a/astrid/libs/todoroo-g.jar b/astrid/libs/todoroo-g.jar index 9f87afc66..49034cac1 100644 Binary files a/astrid/libs/todoroo-g.jar and b/astrid/libs/todoroo-g.jar differ diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java index 4f95da56f..3aa5e723f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java @@ -69,7 +69,7 @@ public class GtasksDetailExposer extends BroadcastReceiver { StringBuilder builder = new StringBuilder(); String listId = metadata.getValue(GtasksMetadata.LIST_ID); - if(listId == Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST)) + if(listId == null || listId.equals(Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST))) return null; String listName = gtasksListService.getListName(listId); if(listName == GtasksListService.LIST_NOT_FOUND) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index edad210c3..57978fa1c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -246,7 +246,7 @@ public class GtasksTaskListUpdater { private void updateModifiedDate(Task taskContainer, long taskId) { taskContainer.setId(taskId); - taskContainer.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); + taskContainer.setValue(Task.DETAILS_DATE, DateUtilities.now()); PluginServices.getTaskService().save(taskContainer); } 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 379a71a73..b3da92157 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -330,6 +330,7 @@ public class GtasksSyncProvider extends SyncProvider { String list = Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST); if(local.gtaskMetadata.containsNonNullValue(GtasksMetadata.LIST_ID)) list = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID); + gtasksTaskListUpdater.updateParentAndSibling(local); ConvenientTaskCreator createdTask; try { @@ -352,10 +353,6 @@ public class GtasksSyncProvider extends SyncProvider { String idTask = local.gtaskMetadata.getValue(GtasksMetadata.ID); String idList = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID); - // fetch remote task for comparison - if(remote == null && idTask != null) - remote = pull(local); - try { // moving between lists @@ -374,10 +371,10 @@ public class GtasksSyncProvider extends SyncProvider { builder.notes(local.task.getValue(Task.NOTES)); String id = idList; - ListAction moveAction = l.move(idTask, local.parentId, local.priorSiblingId); // write task if(builder instanceof TaskModifier) { + ListAction moveAction = l.move(idTask, local.parentId, local.priorSiblingId); ListAction action = ((TaskModifier) builder).done(); if(remote == null || local.parentId != remote.parentId || local.priorSiblingId != remote.priorSiblingId) taskService.executeListActions(idList, action, moveAction); @@ -385,6 +382,7 @@ public class GtasksSyncProvider extends SyncProvider { taskService.executeListActions(idList, action); } else { id = ((ConvenientTaskCreator)builder).go(); + ListAction moveAction = l.move(id, local.parentId, local.priorSiblingId); taskService.executeListActions(idList, moveAction); }