From 3f744f23f9d7ea308f2482cf76c78b3800a204e6 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 23 Feb 2012 01:51:13 -0800
Subject: [PATCH] Fixed quickadd assignment oddity, don't push task in edit
 note activity

---
 .../astrid/actfm/sync/ActFmSyncService.java      |  4 ++--
 .../todoroo/astrid/notes/EditNoteActivity.java   | 16 ++++------------
 .../src/com/todoroo/astrid/ui/QuickAddBar.java   |  6 ++++--
 3 files changed, 10 insertions(+), 16 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 dec73cfab..48a348b4a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -311,11 +311,11 @@ public final class ActFmSyncService {
 
         long creationDate;
         if (task.containsValue(Task.CREATION_DATE)) {
-            creationDate = task.getValue(Task.CREATION_DATE);
+            creationDate = task.getValue(Task.CREATION_DATE) / 1000L; // In seconds
         } else {
             if (taskForRemote == null)
                 return;
-            creationDate = taskForRemote.getValue(Task.CREATION_DATE);
+            creationDate = taskForRemote.getValue(Task.CREATION_DATE) / 1000L; // In seconds
         }
 
         boolean newlyCreated = remoteId == 0;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 8f79fcddc..5c0b3d493 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -371,6 +371,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
     public void refreshData(boolean manual, SyncResultCallback existingCallback) {
+        if(!task.containsNonNullValue(Task.REMOTE_ID)) {
+            return;
+        }
+
         final SyncResultCallback callback;
         if(existingCallback != null)
             callback = existingCallback;
@@ -389,18 +393,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             callback.incrementMax(100);
         }
 
-        // push task if it hasn't been pushed
-        if(!task.containsNonNullValue(Task.REMOTE_ID) && !TextUtils.isEmpty(task.getValue(Task.TITLE))) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    actFmSyncService.pushTask(task.getId());
-                    task = PluginServices.getTaskService().fetchById(task.getId(), Task.NOTES, Task.ID, Task.REMOTE_ID, Task.TITLE);
-                    refreshData(false, callback);
-                }
-            }).start();
-            return;
-        }
 
         actFmSyncService.fetchUpdatesForTask(task, manual, new Runnable() {
             @Override
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 0465fd354..9fecb786c 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -281,8 +281,10 @@ public class QuickAddBar extends LinearLayout {
                 TaskDao.createDefaultHideUntil(task);
             }
             gcalControl.writeToModel(task);
-            peopleControl.setTask(task);
-            peopleControl.saveSharingSettings(null);
+            if (!peopleControl.willBeAssignedToMe()) {
+                peopleControl.setTask(task);
+                peopleControl.saveSharingSettings(null);
+            }
             taskService.save(task);
 
             String assignedTo = peopleControl.getAssignedToString();