duplicate-fix for locally renaming tasks in Astrid, also untested fix for deleting workspaces remotely

pull/14/head
Arne Jans 14 years ago committed by Tim Su
parent f5e297fc0d
commit aa79cd7246

@ -276,8 +276,8 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
TYPE remote = data.remoteUpdated.get(remoteIndex); TYPE remote = data.remoteUpdated.get(remoteIndex);
push(local, remote); push(local, remote);
// re-read remote task after merge // re-read remote task after merge (with local's title)
remote = pull(remote); remote = pull(local);
remote.task.setId(local.task.getId()); remote.task.setId(local.task.getId());
data.remoteUpdated.set(remoteIndex, remote); data.remoteUpdated.set(remoteIndex, remote);
} else { } else {

@ -220,7 +220,7 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
String lastActivityId = Preferences.getStringValue(ProducteevUtilities.PREF_SERVER_LAST_ACTIVITY); String lastActivityId = Preferences.getStringValue(ProducteevUtilities.PREF_SERVER_LAST_ACTIVITY);
// read dashboards // read dashboards
JSONArray dashboards = invoker.dashboardsShowList(null); JSONArray dashboards = invoker.dashboardsShowList(lastServerSync);
dataService.updateDashboards(dashboards); dataService.updateDashboards(dashboards);
// read labels and tasks for each dashboard // read labels and tasks for each dashboard

Loading…
Cancel
Save