From aaaffca49ce9c3b154c3585dea13def9f6810aba Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Sat, 28 Jun 2014 01:48:20 -0500
Subject: [PATCH] Remove unnecessary criterion

---
 .../java/com/todoroo/astrid/activity/TaskEditFragment.java | 2 +-
 .../todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index c225a9096..da6bac275 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -668,7 +668,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         }
 
         boolean tagsChanged = Flags.check(Flags.TAGS_CHANGED);
-        model.putTransitory(TaskService.TRANS_EDIT_SAVE, true);
+        model.putTransitory(TaskService.TRANS_EDIT_SAVE, true); // TODO: not used?
         taskService.save(model);
 
         if (!onPause) {
diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index 585662b11..a3fa812df 100644
--- a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -35,7 +35,6 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.sync.SyncResultCallback;
 import com.todoroo.astrid.sync.SyncV2Provider;
 
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tasks.R;
@@ -135,6 +134,8 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
 
                 final AtomicInteger finisher = new AtomicInteger(lists.length);
 
+                // TODO: Check timestamps from invoker.allGtaskLists and pare down lists to sync
+
                 for (final StoreObject list : lists) {
                     executor.execute(callback, new Runnable() {
                         @Override
@@ -154,9 +155,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     private synchronized void pushUpdated(GtasksInvoker invoker) {
         TodorooCursor<Task> queued = taskService.query(Query.select(Task.PROPERTIES).
                 join(Join.left(Metadata.TABLE, Criterion.and(MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY), Task.ID.eq(Metadata.TASK)))).where(
-                        Criterion.or(Task.MODIFICATION_DATE.gt(GtasksMetadata.LAST_SYNC),
-                                Criterion.and(Task.USER_ID.neq(Task.USER_ID_SELF), GtasksMetadata.ID.isNotNull()), // XXX: Shouldn't this neq("")?
-                                      Metadata.KEY.isNull())));
+                        Criterion.or(Task.MODIFICATION_DATE.gt(GtasksMetadata.LAST_SYNC), Metadata.KEY.isNull())));
         pushTasks(queued, invoker);
     }