From a2940ebbc45c599cc29be838e5bbbd752bf3d636 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 21 Feb 2012 13:55:16 -0800
Subject: [PATCH] Fixed a concurrency bug in gtasks sync, fixed setting of
 gtasks last_sync dates on individual tasks

---
 .../com/todoroo/astrid/gtasks/GtasksMetadataService.java        | 2 +-
 .../com/todoroo/astrid/gtasks/sync/GtasksSyncService.java       | 2 +-
 .../com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
index 7f50d3b64..0fc411c28 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
@@ -77,7 +77,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
     }
 
     @Override
-    public void findLocalMatch(GtasksTaskContainer remoteTask) {
+    public synchronized void findLocalMatch(GtasksTaskContainer remoteTask) {
         if(remoteTask.task.getId() != Task.NO_ID)
             return;
         TodorooCursor<Metadata> cursor = metadataDao.query(Query.select(Metadata.PROPERTIES).
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 2e4e1d4d7..eadeedb04 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@@ -230,7 +230,7 @@ public final class GtasksSyncService {
         }
 
         task.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
-        gtasksMetadata.setValue(GtasksMetadata.LAST_SYNC, DateUtilities.now());
+        gtasksMetadata.setValue(GtasksMetadata.LAST_SYNC, DateUtilities.now() + 1000L);
         metadataService.save(gtasksMetadata);
         Flags.set(Flags.GTASKS_SUPPRESS_SYNC);
         taskDao.saveExisting(task);
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 c6fb19400..fb419d3df 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -208,7 +208,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
                     gtasksMetadataService.findLocalMatch(container);
                     container.gtaskMetadata.setValue(GtasksMetadata.GTASKS_ORDER, Long.parseLong(t.getPosition()));
                     container.gtaskMetadata.setValue(GtasksMetadata.PARENT_TASK, gtasksMetadataService.localIdForGtasksId(t.getParent()));
-                    container.gtaskMetadata.setValue(GtasksMetadata.LAST_SYNC, DateUtilities.now());
+                    container.gtaskMetadata.setValue(GtasksMetadata.LAST_SYNC, DateUtilities.now() + 1000L);
                     write(container);
                     callback.incrementProgress(10);
                 }