From 5c9f3ddbf61898712d754e9e11d850856e37acd0 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 27 Oct 2011 18:43:11 -0700 Subject: [PATCH] Fixed some more bugs with task duplicates and autosync fails --- .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java | 4 ++-- astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index d3b42222a..67419d244 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -275,9 +275,9 @@ public final class ActFmSyncService { */ public void pushTaskOnSave(Task task, ContentValues values) { long remoteId; - if(task.containsValue(Task.REMOTE_ID)) + if(task.containsValue(Task.REMOTE_ID)) { remoteId = task.getValue(Task.REMOTE_ID); - else { + } else { Task taskForRemote = taskService.fetchById(task.getId(), Task.REMOTE_ID); if(taskForRemote == null) return; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index f1b703e16..8742882d8 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -433,6 +433,7 @@ public final class TaskEditActivity extends TabActivity { database.openForReading(); if(idParam > -1L) { model = taskService.fetchById(idParam, Task.PROPERTIES); + model.clearValue(Task.REMOTE_ID); // Having this can screw up autosync } // not found by id or was never passed an id