From 7d6e0253353641b0f1d7d1d8b5018ed5240813b6 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 1 Feb 2013 13:49:56 -0800
Subject: [PATCH] Send changes to PICTURE columns as actual JSON objects, not
 strings

---
 api/src/com/todoroo/andlib/data/Property.java               | 2 ++
 api/src/com/todoroo/astrid/data/TagData.java                | 2 +-
 api/src/com/todoroo/astrid/data/User.java                   | 2 +-
 api/src/com/todoroo/astrid/data/UserActivity.java           | 2 +-
 .../todoroo/astrid/actfm/sync/messages/ChangesHappened.java | 6 ++++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/api/src/com/todoroo/andlib/data/Property.java b/api/src/com/todoroo/andlib/data/Property.java
index 437a1fbb1..e561e32d8 100644
--- a/api/src/com/todoroo/andlib/data/Property.java
+++ b/api/src/com/todoroo/andlib/data/Property.java
@@ -45,6 +45,8 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
     public static final int PROP_FLAG_USER_ID = 1 << 2;
     /** Is this field a boolean? */
     public static final int PROP_FLAG_BOOLEAN = 1 << 3;
+    /** Is this field a serialized JSON object? */
+    public static final int PROP_FLAG_JSON = 1 << 4;
 
     public int flags = 0;
 
diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index 377c79b98..f3b18af73 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -63,7 +63,7 @@ public final class TagData extends RemoteModel {
 
     /** Project picture */
     public static final StringProperty PICTURE = new StringProperty(
-            TABLE, "picture");
+            TABLE, "picture", Property.PROP_FLAG_JSON);
 
     /** Tag team array (JSON) */
     @Deprecated public static final StringProperty MEMBERS = new StringProperty(
diff --git a/api/src/com/todoroo/astrid/data/User.java b/api/src/com/todoroo/astrid/data/User.java
index 875b86eb4..b13662f27 100644
--- a/api/src/com/todoroo/astrid/data/User.java
+++ b/api/src/com/todoroo/astrid/data/User.java
@@ -60,7 +60,7 @@ public final class User extends RemoteModel {
 
     /** User picture */
     public static final StringProperty PICTURE = new StringProperty(
-            TABLE, "picture");
+            TABLE, "picture", Property.PROP_FLAG_JSON);
 
     /** Remote id */
     public static final StringProperty UUID = new StringProperty(
diff --git a/api/src/com/todoroo/astrid/data/UserActivity.java b/api/src/com/todoroo/astrid/data/UserActivity.java
index 83ce23ea2..87b9712b5 100644
--- a/api/src/com/todoroo/astrid/data/UserActivity.java
+++ b/api/src/com/todoroo/astrid/data/UserActivity.java
@@ -54,7 +54,7 @@ public class UserActivity extends RemoteModel {
 
     /** Picture */
     public static final StringProperty PICTURE = new StringProperty(
-            TABLE, "picture");
+            TABLE, "picture", Property.PROP_FLAG_JSON);
 
     /** Target id */
     public static final StringProperty TARGET_ID = new StringProperty(
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 a1c8bd929..4c8662146 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
@@ -204,6 +204,12 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
             String value = getAsString(data);
             if (RemoteModel.NO_UUID.equals(value) && property.checkFlag(Property.PROP_FLAG_USER_ID))
                 return ActFmPreferenceService.userId();
+            if (property.checkFlag(Property.PROP_FLAG_JSON))
+                try {
+                    return new JSONObject(value);
+                } catch (JSONException e) {
+                    //
+                }
             return value;
         }