From 474432076001c018ea91769c08e1033d455143aa Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 27 Feb 2012 16:38:25 -0800 Subject: [PATCH] Fixed a bug in updateFromJson --- .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 11121157b..d3b7ff8e9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -52,7 +52,6 @@ import com.todoroo.astrid.dao.UpdateDao; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria; import com.todoroo.astrid.data.RemoteModel; -import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao; @@ -1128,7 +1127,7 @@ public final class ActFmSyncService { public static void updateFromJson(JSONObject json, Update model) throws JSONException { model.setValue(Update.REMOTE_ID, json.getLong("id")); readUser(json.getJSONObject("user"), model, Update.USER_ID, Update.USER); - if (json.has("other_user")) { + if (!json.isNull("other_user")) { readUser(json.getJSONObject("other_user"), model, Update.OTHER_USER_ID, Update.OTHER_USER); } model.setValue(Update.ACTION, json.getString("action"));