From ed3a274c1898cf19765d527b2245dc136f9b76cc Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 24 Aug 2010 03:11:20 -0700
Subject: [PATCH] temporarily disable un-setting due date, squash another
 source of duplicate tasks - remotely new and completed tasks

---
 .../plugin-src/com/todoroo/astrid/common/SyncProvider.java | 6 ++++++
 .../astrid/producteev/sync/ProducteevSyncProvider.java     | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/common/SyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/common/SyncProvider.java
index 11477a6b0..0fd852c9a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/common/SyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/common/SyncProvider.java
@@ -304,6 +304,12 @@ public abstract class SyncProvider<TYPE extends TaskContainer> {
         length = data.remoteUpdated.size();
         for(int i = 0; i < length; i++) {
             TYPE remote = data.remoteUpdated.get(i);
+
+            // don't synchronize new & deleted / completed tasks
+            if(!remote.task.isSaved() && (remote.task.isDeleted() ||
+                    remote.task.isCompleted()))
+                continue;
+
             try {
                 write(remote);
             } catch (Exception e) {
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 be46f3ef5..b63303d11 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -518,7 +518,7 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
             invoker.tasksSetTitle(idTask, local.task.getValue(Task.TITLE));
         if(shouldTransmit(local, Task.IMPORTANCE, remote))
             invoker.tasksSetStar(idTask, createStars(local.task));
-        if(shouldTransmit(local, Task.DUE_DATE, remote))
+        if(shouldTransmit(local, Task.DUE_DATE, remote) && local.task.hasDueDate()) // temporary can't unset deadline
             invoker.tasksSetDeadline(idTask, createDeadline(local.task), local.task.hasDueTime() ? 0 : 1);
         if(shouldTransmit(local, Task.COMPLETION_DATE, remote))
             invoker.tasksSetStatus(idTask, local.task.isCompleted() ? 2 : 1);
@@ -662,10 +662,7 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
     private String createDeadline(Task task) {
         if(!task.hasDueDate())
             return "";
-        if(!task.hasDueTime())
-            return ApiUtilities.unixDateToProducteev(task.getValue(Task.DUE_DATE));
-        String time = ApiUtilities.unixTimeToProducteev(task.getValue(Task.DUE_DATE));
-        return time.substring(0, time.lastIndexOf(' '));
+        return ApiUtilities.unixTimeToProducteev(task.getValue(Task.DUE_DATE));
     }
 
     /**