From 24350c448b7adf506aeb187f49ec31f4d2e46cd9 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 22 Feb 2012 23:57:55 -0800 Subject: [PATCH] Fixed issues with Gtasks sync on save --- .../com/todoroo/astrid/gtasks/sync/GtasksSyncService.java | 2 +- astrid/src/com/todoroo/astrid/ui/QuickAddBar.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index eadeedb04..31009f236 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java @@ -77,7 +77,7 @@ public final class GtasksSyncService { GtasksInvoker invoker = new GtasksInvoker(gtasksPreferenceService.getToken()); if (op instanceof TaskPushOp) { TaskPushOp taskPush = (TaskPushOp)op; - pushTaskOnSave(taskPush.model, taskPush.model.getSetValues(), invoker, true); + pushTaskOnSave(taskPush.model, taskPush.model.getMergedValues(), invoker, true); } else if (op instanceof MoveOp) { MoveOp move = (MoveOp)op; pushMetadataOnSave(move.metadata, invoker); diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java index 5ceb54ed7..f6440d9d8 100644 --- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java @@ -267,7 +267,8 @@ public class QuickAddBar extends LinearLayout { } Flags.set(Flags.ACTFM_SUPPRESS_SYNC); - Flags.set(Flags.GTASKS_SUPPRESS_SYNC); + if (deadlineControl.isDeadlineSet()) // If deadline is set, second save will trigger push + Flags.set(Flags.GTASKS_SUPPRESS_SYNC); Task task = TaskService.createWithValues(fragment.getFilter().valuesForNewTasks, title, taskService, metadataService);