Merge pull request #168 from sbosley/120326_sb_sync_performance

Gtasks bugfixes

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java

@@ -1017,6 +1017,8 @@ public final class ActFmSyncService {
                     remote.setFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE, false);
 
                 remote.putTransitory(SyncFlags.ACTFM_SUPPRESS_SYNC, true);
+                if (remote.getValue(Task.USER_ID) != Task.USER_ID_SELF)
+                    remote.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
                 taskService.save(remote);
                 ids.add(remote.getId());
                 metadataService.synchronizeMetadata(remote.getId(), metadata, MetadataCriteria.withKey(TagService.KEY));

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

@@ -107,6 +107,9 @@ public final class GtasksSyncService {
                     return;
 
                 Task toPush = taskDao.fetch(model.getId(), TASK_PROPERTIES);
+                if (toPush.getValue(Task.USER_ID) != Task.USER_ID_SELF)
+                    return;
+
                 operationQueue.offer(new TaskPushOp(toPush));
             }
         });
@@ -187,9 +190,10 @@ public final class GtasksSyncService {
         }
 
         //If task was newly created but without a title, don't sync--we're in the middle of
-        //creating a task which may end up being cancelled
+        //creating a task which may end up being cancelled. Also don't sync new but already
+        //deleted tasks
         if (newlyCreated &&
-                (!values.containsKey(Task.TITLE.name) || TextUtils.isEmpty(task.getValue(Task.TITLE)))) {
+                (!values.containsKey(Task.TITLE.name) || TextUtils.isEmpty(task.getValue(Task.TITLE)) || task.getValue(Task.DELETION_DATE) > 0)) {
             return;
         }
 

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

@@ -143,10 +143,11 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     private synchronized void pushUpdated(GtasksInvoker invoker, SyncResultCallback callback) {
         TodorooCursor<Task> queued = taskService.query(Query.select(Task.PROPERTIES).
                 join(Join.left(Metadata.TABLE, Task.ID.eq(Metadata.TASK))).where(
+                Criterion.and(Task.USER_ID.eq(Task.USER_ID_SELF),
                         Criterion.or(
                                 Criterion.and(MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
                                         Task.MODIFICATION_DATE.gt(GtasksMetadata.LAST_SYNC)),
-                        Metadata.KEY.isNull())));
+                                        Metadata.KEY.isNull()))));
         callback.incrementMax(queued.getCount() * 10);
         try {
             Task task = new Task();