From b0ac54ef302b41f2662d44ad043a7dd0c1e25c4d Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 6 Apr 2012 14:16:06 -0700 Subject: [PATCH] Fixed a bug with using the contact picker --- .../todoroo/astrid/actfm/EditPeopleControlSet.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 5204473a5..43b88da6b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -122,6 +122,8 @@ public class EditPeopleControlSet extends PopupControlSet { private AssignedToUser taskRabbitUser = null; + private AssignedToUser contactPickerUser = null; + private boolean loadedUI = false; private boolean dontClearAssignedCustom = false; @@ -428,11 +430,11 @@ public class EditPeopleControlSet extends PopupControlSet { } } - AssignedToUser chooseContact = new AssignedToUser(activity.getString(R.string.actfm_EPA_choose_contact), + contactPickerUser = new AssignedToUser(activity.getString(R.string.actfm_EPA_choose_contact), new JSONObject().put("default_picture", R.drawable.icn_friends) .put(CONTACT_CHOOSER_USER, true)); int contactsIndex = addUnassigned ? 2 : 1; - listValues.add(contactsIndex, chooseContact); + listValues.add(contactsIndex, contactPickerUser); if (assignedIndex >= contactsIndex) assignedIndex++; @@ -640,10 +642,7 @@ public class EditPeopleControlSet extends PopupControlSet { return true; AssignedToUser item = (AssignedToUser) assignedList.getAdapter().getItem(assignedList.getCheckedItemPosition()); if (item != null) { - if (item.equals(taskRabbitUser)) { //don't want to ever set the user as the task rabbit user - - /*item = (AssignedToUser) assignedList.getAdapter().getItem(0); - selected = 0;*/ + if (item.equals(taskRabbitUser) || item.equals(contactPickerUser)) { //don't want to ever set the user as the task rabbit user return true; } userJson = item.user;