From c5e785b902c17bf8f35976372781c9b2aebdfc93 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 16 Jan 2013 13:28:24 -0800 Subject: [PATCH] Fixed a bug where unassigning a task could issue a weird prompt about adding nobody to the list --- .../com/todoroo/astrid/actfm/EditPeopleControlSet.java | 2 +- astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 8a180f33b..5d8606da4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -741,6 +741,7 @@ public class EditPeopleControlSet extends PopupControlSet { } else if(userJson.optLong("id") == Task.USER_ID_UNASSIGNED) { 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, "{}"); } else { 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, user); - String assignedName = userJson.optString("name", userEmail); } JSONObject sharedWith = sharedWithContainer.parseSharedWithAndTags(activity, false); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index f8b6a201b..6cb17a01d 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -932,7 +932,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { try { JSONObject assignedUser = new JSONObject(model.getValue(Task.USER)); 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) { // }