Google task views show completed tasks to match up with google. Now we set remote ids for remote incoming tasks too.

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java

@@ -52,7 +52,8 @@ public class GtasksFilterExposer extends BroadcastReceiver {
         Filter filter = new Filter(listName, listName, new QueryTemplate().join(
                 Join.left(Metadata.TABLE, Task.ID.eq(Metadata.TASK))).where(Criterion.and(
                         MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
-                        TaskCriteria.activeAndVisible(),
+                        TaskCriteria.isVisible(),
+                        TaskCriteria.notDeleted(),
                         GtasksMetadata.LIST_ID.eq(list.getValue(GtasksList.REMOTE_ID)))).orderBy(Order.asc(GtasksMetadata.ORDER)),
                 values);
 

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java

@@ -139,6 +139,10 @@ public class GtasksTaskListUpdater {
         }
     }
 
+    public void addRemoteTaskMapping(long id, String remoteId) {
+        localToRemoteIdMap.put(id, remoteId);
+    }
+
     // --- private helpers
 
     private interface ListIterator {

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java

@@ -353,6 +353,7 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
         String remoteId;
         try {
             remoteId = createdTask.go();
+            gtasksTaskListUpdater.addRemoteTaskMapping(local.task.getId(), remoteId);
         } catch (JSONException e) {
             throw new GoogleTasksException(e);
         }
@@ -415,11 +416,11 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
         task.setValue(Task.NOTES, remoteTask.getNotes());
 
         Metadata gtasksMetadata = GtasksMetadata.createEmptyMetadata(AbstractModel.NO_ID);
+        gtasksMetadata.setValue(GtasksMetadata.ID, remoteTask.getId());
         gtasksMetadata.setValue(GtasksMetadata.LIST_ID, remoteTask.getList_id());
 
         GtasksTaskContainer container = new GtasksTaskContainer(task, metadata,
                 gtasksMetadata);
-        // TODO indent
         return container;
     }
 
@@ -453,6 +454,8 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
     @Override
     protected void push(GtasksTaskContainer local, GtasksTaskContainer remote) throws IOException {
         try {
+            gtasksTaskListUpdater.updateParentAndSibling(local);
+
             String id = local.gtaskMetadata.getValue(GtasksMetadata.ID);
             TaskModifier modifyTask = l.modifyTask(id);
             updateTaskHelper(local, remote, modifyTask);