Fixed issues with Gtasks sync on save

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);

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);