From b995f6dbbedabf84d8365d9dd26db82d70c439f0 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 11 Feb 2013 14:03:09 -0800
Subject: [PATCH] Fixed file uploading (use JSON instead of string), make sure
 that EditNoteActivity has Task.PUSHED_AT

---
 .../com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java | 2 +-
 .../plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
index 55daf8c74..7471d726a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
@@ -125,7 +125,7 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
                         PluginServices.getTaskAttachmentDao().delete(id);
                         continue;
                     } else {
-                        changeJson.put("value", fileJson.toString());
+                        changeJson.put("value", fileJson);
                     }
                 } else {
                     Property<?> localProperty = NameMaps.localColumnNameToProperty(table, localColumn);
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 5249e946e..ab70706e8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -148,7 +148,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     public void loadViewForTaskID(long t){
         try {
-            task = PluginServices.getTaskService().fetchById(t, Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE);
+            task = PluginServices.getTaskService().fetchById(t, Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE, Task.PUSHED_AT);
         } catch (SQLiteException e) {
             StartupService.handleSQLiteError(ContextManager.getContext(), e);
         }