Fixed a bug where unassigning a task could issue a weird prompt about adding nobody to the list

pull/14/head
Sam Bosley 13 years ago
parent 208b1c3e5f
commit c5e785b902

@ -741,6 +741,7 @@ public class EditPeopleControlSet extends PopupControlSet {
} else if(userJson.optLong("id") == Task.USER_ID_UNASSIGNED) { } else if(userJson.optLong("id") == Task.USER_ID_UNASSIGNED) {
dirty = task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED ? dirty : true; dirty = task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED ? dirty : true;
task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED); task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
task.setValue(Task.USER, "{}");
} else { } else {
String user = userJson.toString(); String user = userJson.toString();
@ -764,7 +765,6 @@ public class EditPeopleControlSet extends PopupControlSet {
task.setValue(Task.USER_ID, userJson.optLong("id", Task.USER_ID_EMAIL)); task.setValue(Task.USER_ID, userJson.optLong("id", Task.USER_ID_EMAIL));
task.setValue(Task.USER, user); task.setValue(Task.USER, user);
String assignedName = userJson.optString("name", userEmail);
} }
JSONObject sharedWith = sharedWithContainer.parseSharedWithAndTags(activity, false); JSONObject sharedWith = sharedWithContainer.parseSharedWithAndTags(activity, false);

@ -932,7 +932,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
try { try {
JSONObject assignedUser = new JSONObject(model.getValue(Task.USER)); JSONObject assignedUser = new JSONObject(model.getValue(Task.USER));
assignedEmail = assignedUser.optString("email", ""); //$NON-NLS-1$ //$NON-NLS-2$ assignedEmail = assignedUser.optString("email", ""); //$NON-NLS-1$ //$NON-NLS-2$
assignedId = assignedUser.optLong("id", Task.USER_ID_IGNORE); assignedId = assignedUser.optLong("id", Task.USER_ID_IGNORE); //$NON-NLS-1$
} catch (JSONException e) { } catch (JSONException e) {
// //
} }

Loading…
Cancel
Save