archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed issues with writing tag_added or tag_removed to json in ChangesHappened

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 4456dfc143
commit a2e897083e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File

17
astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
Unescape Escape View File

@ -87,19 +87,28 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
for (OE change : changes) {
try {
String localColumn = change.getValue(OutstandingEntry.COLUMN_STRING_PROPERTY);
JSONObject changeJson = new JSONObject();
changeJson.put("id", change.getId());
String serverColumn;
if (NameMaps.TAG_ADDED_COLUMN.equals(localColumn)) {
serverColumn = NameMaps.TAG_ADDED_COLUMN;
changeJson.put("value", change.getValue(OutstandingEntry.VALUE_STRING_PROPERTY));
} else if (NameMaps.TAG_REMOVED_COLUMN.equals(localColumn)) {
serverColumn = NameMaps.TAG_REMOVED_COLUMN;
changeJson.put("value", change.getValue(OutstandingEntry.VALUE_STRING_PROPERTY));
} else {
Property<?> localProperty = NameMaps.localColumnNameToProperty(table, localColumn);
if (localProperty == null)
throw new RuntimeException("No local property found for local column " + localColumn + " in table " + table);
String serverColumn = NameMaps.localColumnNameToServerColumnName(table, localColumn);
serverColumn = NameMaps.localColumnNameToServerColumnName(table, localColumn);
if (serverColumn == null)
throw new RuntimeException("No server column found for local column " + localColumn + " in table " + table);
changeJson.put("value", localProperty.accept(visitor, change));
}
JSONObject changeJson = new JSONObject();
changeJson.put("id", change.getId());
changeJson.put("column", serverColumn);
changeJson.put("value", localProperty.accept(visitor, change));
array.put(changeJson);
} catch (JSONException e) {

Write Preview
Loading…
Cancel
Save