Don't allow tasks not assigned to me to be on gtasks

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

@@ -151,7 +151,7 @@ public final class GtasksSyncService {
     }
 
     private static final Property<?>[] TASK_PROPERTIES = { Task.ID, Task.TITLE,
-            Task.NOTES, Task.DUE_DATE, Task.COMPLETION_DATE, Task.DELETION_DATE };
+            Task.NOTES, Task.DUE_DATE, Task.COMPLETION_DATE, Task.DELETION_DATE, Task.USER_ID };
 
     /**
      * Checks to see if any of the values changed are among the properties we sync
@@ -198,8 +198,9 @@ public final class GtasksSyncService {
             if (gtasksMetadata != null && !TextUtils.isEmpty(gtasksMetadata.getValue(GtasksMetadata.ID))) {
                 try {
                     invoker.deleteGtask(gtasksMetadata.getValue(GtasksMetadata.LIST_ID), gtasksMetadata.getValue(GtasksMetadata.ID));
-                } catch (IOException e) {
                     metadataDao.delete(gtasksMetadata.getId());
+                } catch (IOException e) {
+                    //
                 }
             }
             return;

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

@@ -150,6 +150,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         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()),
                                       Metadata.KEY.isNull())));
         callback.incrementMax(queued.getCount() * 10);
         try {