From afe15a91c089c4f488291c365b208bb74aaccb00 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 18 Jan 2013 11:16:02 -0800
Subject: [PATCH] Correctly format dates in changeshappened

---
 api/src/com/todoroo/andlib/utility/DateUtilities.java        | 5 +++++
 .../todoroo/astrid/actfm/sync/messages/ChangesHappened.java  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java
index 78831994a..a14f3d469 100644
--- a/api/src/com/todoroo/andlib/utility/DateUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java
@@ -291,4 +291,9 @@ public class DateUtilities {
         return result;
     }
 
+    public static String timeToIso8601(long time) {
+        Date date = new Date(time);
+        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(date); //$NON-NLS-1$
+    }
+
 }
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 fe40ffbe0..1d214da92 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
@@ -14,6 +14,7 @@ import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread.ModelType;
 import com.todoroo.astrid.core.PluginServices;
@@ -162,7 +163,7 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
                 if (l == 0 && property.checkFlag(Property.PROP_FLAG_USER_ID))
                     return ActFmPreferenceService.userId();
                 else if (property.checkFlag(Property.PROP_FLAG_DATE))
-                    return l.longValue() / 1000L;
+                    return DateUtilities.timeToIso8601(l);
                 return l;
             } else {
                 return getAsString(data);