From 7c3147ca6c8ce3761e45e65ecdade4de906b7142 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 2 Aug 2011 00:46:57 -0700
Subject: [PATCH] Ixnay duplicated notes

---
 .../astrid/producteev/sync/ProducteevDataService.java      | 4 ++--
 .../astrid/producteev/sync/ProducteevSyncProvider.java     | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java
index bf9703399..1309a793a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java
@@ -152,10 +152,10 @@ public final class ProducteevDataService {
         taskDao.save(task.task);
 
         task.metadata.add(task.pdvTask);
+        // note we don't include note metadata, since we only receive deltas
         metadataService.synchronizeMetadata(task.task.getId(), task.metadata,
                 Criterion.or(MetadataCriteria.withKey(ProducteevTask.METADATA_KEY),
-                        MetadataCriteria.withKey(TagService.KEY),
-                        MetadataCriteria.withKey(NoteMetadata.METADATA_KEY)));
+                        MetadataCriteria.withKey(TagService.KEY)));
     }
 
     /**
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
index 13ce653d9..5015ac573 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -387,11 +387,10 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
         JSONArray notes = remoteTask.getJSONArray("notes");
         for(int i = notes.length() - 1; i >= 0; i--) {
             JSONObject note = notes.getJSONObject(i).getJSONObject("note");
-            if(note.getLong("deleted") != 0) {
-                PluginServices.getMetadataService().deleteWhere(Criterion.and(Metadata.KEY.eq(NoteMetadata.METADATA_KEY),
-                                NoteMetadata.EXT_ID.eq(note.getString("id_note"))));
+            PluginServices.getMetadataService().deleteWhere(Criterion.and(Metadata.KEY.eq(NoteMetadata.METADATA_KEY),
+                    NoteMetadata.EXT_ID.eq(note.getString("id_note"))));
+            if(note.getLong("deleted") != 0)
                 continue;
-            }
 
             long creator = note.getLong("id_creator");
             metadata.add(ApiUtilities.createNoteMetadata(note, creatorName(container, creator)));