From 316aee0320f1c6c0ec2fc08adf7be5694c4f8ad9 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 15 Jun 2012 11:38:28 -0700 Subject: [PATCH] Don't allow tasks not assigned to me to be on gtasks --- .../com/todoroo/astrid/gtasks/sync/GtasksSyncService.java | 5 +++-- .../com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index cb62fcad2..6a2665816 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/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; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java index 8a6ec5490..f60331727 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -150,6 +150,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { TodorooCursor 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 {