From 22cd64bda94db0da5e10ead9a433aba6f97e939a Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 20 Dec 2010 03:52:38 -0800
Subject: [PATCH] Fix for AST-471 - editing from the web causing duplicate
 tasks. how did i forget this

---
 .../astrid/producteev/sync/ProducteevSyncProvider.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 8b1b52516..c318d240f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -245,6 +245,8 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
                         if(remote.task.hasDueDate() && remote.task.getValue(Task.DUE_DATE) < DateUtilities.now())
                             remote.task.setFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE, false);
 
+                        dataService.findLocalMatch(remote);
+
                         remoteTasks.add(remote);
                     }
                 } catch (ApiServiceException ase) {
@@ -604,7 +606,8 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
                 local.pdvTask.setValue(ProducteevTask.DASHBOARD_ID, remote.pdvTask.getValue(ProducteevTask.DASHBOARD_ID));
                 local.pdvTask.setValue(ProducteevTask.CREATOR_ID, remote.pdvTask.getValue(ProducteevTask.CREATOR_ID));
                 local.pdvTask.setValue(ProducteevTask.RESPONSIBLE_ID, remote.pdvTask.getValue(ProducteevTask.RESPONSIBLE_ID));
-                local.pdvTask.setValue(ProducteevTask.REPEATING_SETTING, remote.pdvTask.getValue(ProducteevTask.REPEATING_SETTING));
+                if(remote.pdvTask.containsNonNullValue(ProducteevTask.REPEATING_SETTING))
+                    local.pdvTask.setValue(ProducteevTask.REPEATING_SETTING, remote.pdvTask.getValue(ProducteevTask.REPEATING_SETTING));
             }
         } catch (JSONException e) {
             throw new ApiResponseParseException(e);