From aa79cd724618f87122ff25ff2dc2e95782d50f7a Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Tue, 22 Feb 2011 01:26:38 +0100
Subject: [PATCH] duplicate-fix for locally renaming tasks in Astrid, also
 untested fix for deleting workspaces remotely

---
 api/src/com/todoroo/astrid/sync/SyncProvider.java             | 4 ++--
 .../astrid/producteev/sync/ProducteevSyncProvider.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java
index 78d0c15df..d1e438b52 100644
--- a/api/src/com/todoroo/astrid/sync/SyncProvider.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java
@@ -276,8 +276,8 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
                     TYPE remote = data.remoteUpdated.get(remoteIndex);
                     push(local, remote);
 
-                    // re-read remote task after merge
-                    remote = pull(remote);
+                    // re-read remote task after merge (with local's title)
+                    remote = pull(local);
                     remote.task.setId(local.task.getId());
                     data.remoteUpdated.set(remoteIndex, remote);
                 } else {
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 3c6f044d2..288b18d09 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -220,7 +220,7 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
             String lastActivityId = Preferences.getStringValue(ProducteevUtilities.PREF_SERVER_LAST_ACTIVITY);
 
             // read dashboards
-            JSONArray dashboards = invoker.dashboardsShowList(null);
+            JSONArray dashboards = invoker.dashboardsShowList(lastServerSync);
             dataService.updateDashboards(dashboards);
 
             // read labels and tasks for each dashboard