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

Fixed several places where missing properties needed to be read or were the wrong type

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent ed6d4fc852
commit 20c94fe178
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File

38
astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
Unescape Escape View File

@ -370,6 +370,18 @@ public class EditPeopleControlSet extends PopupControlSet {
}); });
} }
private String getLongOrStringId(JSONObject obj, String defaultValue) {
try {
long value = obj.getLong("id"); //$NON-NLS-1$
return Long.toString(value);
} catch (JSONException e) {
String value = obj.optString("id"); //$NON-NLS-1$
if (TextUtils.isEmpty(value))
value = defaultValue;
return value;
}
}
@SuppressWarnings("nls") @SuppressWarnings("nls")
private ArrayList<AssignedToUser> convertJsonUsersToAssignedUsers(ArrayList<JSONObject> jsonUsers, private ArrayList<AssignedToUser> convertJsonUsersToAssignedUsers(ArrayList<JSONObject> jsonUsers,
HashSet<String> userIds, HashSet<String> emails, HashMap<String, AssignedToUser> names) { HashSet<String> userIds, HashSet<String> emails, HashMap<String, AssignedToUser> names) {
@ -378,7 +390,7 @@ public class EditPeopleControlSet extends PopupControlSet {
JSONObject person = jsonUsers.get(i); JSONObject person = jsonUsers.get(i);
if(person == null) if(person == null)
continue; continue;
String id = Long.toString(person.optLong("id", -2)); String id = getLongOrStringId(person, Task.USER_ID_EMAIL);
if(ActFmPreferenceService.userId().equals(id) || ((Task.USER_ID_UNASSIGNED.equals(id) || Task.isRealUserId(id)) && userIds.contains(id))) if(ActFmPreferenceService.userId().equals(id) || ((Task.USER_ID_UNASSIGNED.equals(id) || Task.isRealUserId(id)) && userIds.contains(id)))
continue; continue;
userIds.add(id); userIds.add(id);
@ -418,11 +430,11 @@ public class EditPeopleControlSet extends PopupControlSet {
@SuppressWarnings("nls") @SuppressWarnings("nls")
private int findAssignedIndex(Task t, ArrayList<AssignedToUser>... userLists) { private int findAssignedIndex(Task t, ArrayList<AssignedToUser>... userLists) {
String assignedStr = t.getValue(Task.USER); String assignedStr = t.getValue(Task.USER);
long assignedId = -2; String assignedId = "-2";
String assignedEmail = t.getValue(Task.USER_ID); String assignedEmail = t.getValue(Task.USER_ID);
try { try {
JSONObject assigned = new JSONObject(assignedStr); JSONObject assigned = new JSONObject(assignedStr);
assignedId = assigned.optLong("id", -2); assignedId = getLongOrStringId(assigned, Task.USER_ID_EMAIL);
assignedEmail = assigned.optString("email"); assignedEmail = assigned.optString("email");
} catch (JSONException e) { } catch (JSONException e) {
User assignedUser = userDao.fetch(t.getValue(Task.USER_ID), User.PROPERTIES); User assignedUser = userDao.fetch(t.getValue(Task.USER_ID), User.PROPERTIES);
@ -430,7 +442,11 @@ public class EditPeopleControlSet extends PopupControlSet {
try { try {
if (assignedUser != null) { if (assignedUser != null) {
ActFmSyncService.JsonHelper.jsonFromUser(assigned, assignedUser); ActFmSyncService.JsonHelper.jsonFromUser(assigned, assignedUser);
assignedId = assigned.optLong("id", -2); try {
assignedId = assigned.getString("id");
} catch (JSONException e2) {
assignedId = getLongOrStringId(assigned, Task.USER_ID_EMAIL);
}
assignedEmail = assigned.optString("email"); assignedEmail = assigned.optString("email");
} }
} catch (JSONException e2) { } catch (JSONException e2) {
@ -443,7 +459,7 @@ public class EditPeopleControlSet extends PopupControlSet {
for (int i = 0; i < userList.size(); i++) { for (int i = 0; i < userList.size(); i++) {
JSONObject user = userList.get(i).user; JSONObject user = userList.get(i).user;
if (user != null) { if (user != null) {
if (user.optLong("id") == assignedId || if (getLongOrStringId(user, Task.USER_ID_EMAIL).equals(assignedId) ||
(user.optString("email").equals(assignedEmail) && (user.optString("email").equals(assignedEmail) &&
!(TextUtils.isEmpty(assignedEmail)))) !(TextUtils.isEmpty(assignedEmail))))
return index; return index;
@ -649,12 +665,12 @@ public class EditPeopleControlSet extends PopupControlSet {
activity.getString(R.string.actfm_EPA_invalid_email, userJson.optString("email"))); activity.getString(R.string.actfm_EPA_invalid_email, userJson.optString("email")));
} }
if(userJson == null || Task.USER_ID_SELF.equals(Long.toString(userJson.optLong("id", -2)))) { if(userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
dirty = Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID)) ? dirty : true; dirty = Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID)) ? dirty : true;
task.setValue(Task.USER_ID, Task.USER_ID_SELF); task.setValue(Task.USER_ID, Task.USER_ID_SELF);
task.setValue(Task.USER, ""); task.setValue(Task.USER, "");
assignedToMe = true; assignedToMe = true;
} else if(Task.USER_ID_UNASSIGNED.equals(Long.toString(userJson.optLong("id")))) { } else if(Task.USER_ID_UNASSIGNED.equals(getLongOrStringId(userJson, Task.USER_ID_SELF))) {
dirty = Task.USER_ID_UNASSIGNED.equals(task.getValue(Task.USER_ID)) ? dirty : true; dirty = Task.USER_ID_UNASSIGNED.equals(task.getValue(Task.USER_ID)) ? dirty : true;
task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED); task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
task.setValue(Task.USER, ""); task.setValue(Task.USER, "");
@ -664,7 +680,7 @@ public class EditPeopleControlSet extends PopupControlSet {
try { try {
@SuppressWarnings("deprecation") // For backwards compatibility @SuppressWarnings("deprecation") // For backwards compatibility
JSONObject taskUser = new JSONObject(task.getValue(Task.USER)); JSONObject taskUser = new JSONObject(task.getValue(Task.USER));
taskUserId = Long.toString(taskUser.optLong("id", -2)); taskUserId = getLongOrStringId(taskUser, Task.USER_ID_EMAIL);
taskUserEmail = taskUser.optString("email"); taskUserEmail = taskUser.optString("email");
} catch (JSONException e) { } catch (JSONException e) {
// sad times // sad times
@ -672,14 +688,14 @@ public class EditPeopleControlSet extends PopupControlSet {
if (Task.userIdIsEmail(taskUserId)) if (Task.userIdIsEmail(taskUserId))
taskUserEmail = taskUserId; taskUserEmail = taskUserId;
} }
String userId = Long.toString(userJson.optLong("id", -2)); String userId = getLongOrStringId(userJson, Task.USER_ID_EMAIL);
String userEmail = userJson.optString("email"); String userEmail = userJson.optString("email");
boolean match = userId.equals(taskUserId); boolean match = userId.equals(taskUserId);
match = match || (userEmail.equals(taskUserEmail) && !TextUtils.isEmpty(userEmail)); match = match || (userEmail.equals(taskUserEmail) && !TextUtils.isEmpty(userEmail));
dirty = match ? dirty : true; dirty = match ? dirty : true;
String willAssignToId = Long.toString(userJson.optLong("id", -2)); String willAssignToId = getLongOrStringId(userJson, Task.USER_ID_EMAIL);
task.setValue(Task.USER_ID, willAssignToId); task.setValue(Task.USER_ID, willAssignToId);
if (Task.USER_ID_EMAIL.equals(task.getValue(Task.USER_ID))) if (Task.USER_ID_EMAIL.equals(task.getValue(Task.USER_ID)))
task.setValue(Task.USER_ID, userEmail); task.setValue(Task.USER_ID, userEmail);
@ -759,7 +775,7 @@ public class EditPeopleControlSet extends PopupControlSet {
userJson = item.user; userJson = item.user;
} }
if(userJson == null || Task.USER_ID_SELF.equals(Long.toString(userJson.optLong("id", -2)))) { //$NON-NLS-1$ if(userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
return true; return true;
} }

2
astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
Unescape Escape View File

@ -300,6 +300,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
String type = updates.getString(UpdateAdapter.TYPE_PROPERTY_INDEX); String type = updates.getString(UpdateAdapter.TYPE_PROPERTY_INDEX);
NoteOrUpdate noa; NoteOrUpdate noa;
UpdateAdapter.readUserProperties(updates, user);
if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) { if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) {
UpdateAdapter.readUserActivityProperties(updates, update); UpdateAdapter.readUserActivityProperties(updates, update);
noa = NoteOrUpdate.fromUpdateOrHistory(activity, update, null, user, linkColor); noa = NoteOrUpdate.fromUpdateOrHistory(activity, update, null, user, linkColor);
@ -307,7 +308,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
UpdateAdapter.readHistoryProperties(updates, history); UpdateAdapter.readHistoryProperties(updates, history);
noa = NoteOrUpdate.fromUpdateOrHistory(activity, null, history, user, linkColor); noa = NoteOrUpdate.fromUpdateOrHistory(activity, null, history, user, linkColor);
} }
UpdateAdapter.readUserProperties(updates, user);
if(noa != null) if(noa != null)
items.add(noa); items.add(noa);
} }

4
astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
Unescape Escape View File

@ -103,6 +103,7 @@ public class UpdateAdapter extends CursorAdapter {
UserActivity.TARGET_ID, UserActivity.TARGET_ID,
UserActivity.TARGET_NAME, UserActivity.TARGET_NAME,
UserActivity.PICTURE, UserActivity.PICTURE,
UserActivity.USER_UUID,
UserActivity.ID, UserActivity.ID,
ACTIVITY_TYPE_PROPERTY, ACTIVITY_TYPE_PROPERTY,
}; };
@ -115,6 +116,7 @@ public class UpdateAdapter extends CursorAdapter {
History.OLD_VALUE, History.OLD_VALUE,
History.NEW_VALUE, History.NEW_VALUE,
History.TASK, History.TASK,
History.USER_UUID,
History.ID, History.ID,
HISTORY_TYPE_PROPERTY, HISTORY_TYPE_PROPERTY,
}; };
@ -222,6 +224,7 @@ public class UpdateAdapter extends CursorAdapter {
activity.setValue(UserActivity.TARGET_ID, unionCursor.getString(4)); activity.setValue(UserActivity.TARGET_ID, unionCursor.getString(4));
activity.setValue(UserActivity.TARGET_NAME, unionCursor.getString(5)); activity.setValue(UserActivity.TARGET_NAME, unionCursor.getString(5));
activity.setValue(UserActivity.PICTURE, unionCursor.getString(6)); activity.setValue(UserActivity.PICTURE, unionCursor.getString(6));
activity.setValue(UserActivity.USER_UUID, unionCursor.getString(7));
} }
public static void readHistoryProperties(TodorooCursor<UserActivity> unionCursor, History history) { public static void readHistoryProperties(TodorooCursor<UserActivity> unionCursor, History history) {
@ -232,6 +235,7 @@ public class UpdateAdapter extends CursorAdapter {
history.setValue(History.OLD_VALUE, unionCursor.getString(4)); history.setValue(History.OLD_VALUE, unionCursor.getString(4));
history.setValue(History.NEW_VALUE, unionCursor.getString(5)); history.setValue(History.NEW_VALUE, unionCursor.getString(5));
history.setValue(History.TASK, unionCursor.getString(6)); history.setValue(History.TASK, unionCursor.getString(6));
history.setValue(History.USER_UUID, unionCursor.getString(7));
} }
public static void readUserProperties(TodorooCursor<UserActivity> joinCursor, User user) { public static void readUserProperties(TodorooCursor<UserActivity> joinCursor, User user) {

Write Preview
Loading…
Cancel
Save