From 0de220849a44854938d14bc5142b314e5bf54a1b Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 30 Nov 2010 11:50:46 -0800
Subject: [PATCH] quick fix for AST-428

Conflicts:

	astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
---
 .../sync/ProducteevSyncProvider.java          | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

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 a2b036032..d92b28baf 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@@ -229,24 +229,28 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
                 JSONArray labels = invoker.labelsShowList(dashboardId, null);
                 readLabels(labels);
 
-                JSONArray tasks = invoker.tasksShowList(dashboardId, lastServerSync);
-                for(int i = 0; i < tasks.length(); i++) {
-                    ProducteevTaskContainer remote = parseRemoteTask(tasks.getJSONObject(i));
-                    // update reminder flags for incoming remote tasks to prevent annoying
-                    if(remote.task.hasDueDate() && remote.task.getValue(Task.DUE_DATE) < DateUtilities.now())
-                        remote.task.setFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE, false);
-                    boolean foundLocal = dataService.findLocalMatch(remote);
-
-                    // if creator & responsible != current user, skip / delete it
-                    if(userId != remote.pdvTask.getValue(ProducteevTask.CREATOR_ID) &&
-                            userId != remote.pdvTask.getValue(ProducteevTask.RESPONSIBLE_ID)) {
-                        if(foundLocal)
-                            remote.task.setValue(Task.DELETION_DATE, DateUtilities.now());
+                try {
+                    // This invocation throws ApiServiceException for workspaces that need to be upgraded
+                    JSONArray tasks = invoker.tasksShowList(dashboardId, lastServerSync);
+                    for(int i = 0; i < tasks.length(); i++) {
+                        ProducteevTaskContainer remote = parseRemoteTask(tasks.getJSONObject(i));
+                        // update reminder flags for incoming remote tasks to prevent annoying
+                        if(remote.task.hasDueDate() && remote.task.getValue(Task.DUE_DATE) < DateUtilities.now())
+                            remote.task.setFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE, false);
+                        boolean foundLocal = dataService.findLocalMatch(remote);
+
+                        // if creator & responsible != current user, set it to readonly
+                        if(userId != remote.pdvTask.getValue(ProducteevTask.CREATOR_ID) &&
+                              userId != remote.pdvTask.getValue(ProducteevTask.RESPONSIBLE_ID))
+                            remote.task.setFlag(Task.FLAGS, Task.FLAG_IS_READONLY, true);
                         else
-                            continue;
-                    }
+                            remote.task.setFlag(Task.FLAGS, Task.FLAG_IS_READONLY, false);
 
-                    remoteTasks.add(remote);
+                        remoteTasks.add(remote);
+                    }
+                } catch (ApiServiceException ase) {
+                    // catch it here, so that other dashboards can still be synchronized
+                    handleException("pdv-sync", ase, true); //$NON-NLS-1$
                 }
             }