From 235dc415dea29164a170714933785772a85c92c3 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 2 May 2012 11:55:56 -0700
Subject: [PATCH] Temporary fix for a task edit crash in tablets

---
 .../com/todoroo/astrid/actfm/EditPeopleControlSet.java     | 1 +
 .../todoroo/astrid/taskrabbit/TaskRabbitControlSet.java    | 3 ++-
 .../src/com/todoroo/astrid/activity/TaskListActivity.java  | 7 +------
 .../src/com/todoroo/astrid/activity/TaskListFragment.java  | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 2e403f4a7..1d1432be0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -592,6 +592,7 @@ public class EditPeopleControlSet extends PopupControlSet {
             public void onItemClick(AdapterView<?> arg0, View arg1, int position,
                     long id) {
                 AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position);
+                System.err.println("Position: " + position + ", label: " + user.label + ", user: " + user.user);
 
                 for (AssignedChangedListener l : listeners) {
                     if(l.showTaskRabbitForUser(user.label, user.user)) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
index 95c47ce9d..3367e5808 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
@@ -169,7 +169,8 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
     /** Fire task rabbit if assigned **/
     @Override
     public boolean showTaskRabbitForUser(String name, JSONObject json) {
-        if (name.equals(fragment.getActivity().getString(R.string.actfm_EPA_task_rabbit))) {
+        Activity fragActivity = fragment.getActivity();
+        if (fragActivity != null && name.equals(fragActivity.getString(R.string.actfm_EPA_task_rabbit))) {
             showTaskRabbitActivity();
             return true;
         }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 34b68d1c5..98d141b21 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -403,7 +403,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             } else {
                 TaskListFragment tlf = getTaskListFragment();
                 if (tlf != null) {
-                    System.err.println("Adding task");
                     Task result = tlf.quickAddBar.quickAddTask("", true); //$NON-NLS-1$
                     if (result != null)
                         onTaskListItemClicked(result.getId());
@@ -439,11 +438,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     @Override
     protected void onStop() {
         super.onStop();
-        try {
-            unregisterReceiver(tagDeletedReceiver);
-        } catch (IllegalArgumentException e) {
-            // Receiver might not be registered if for example activity is stopped before on resume (?)
-        }
+        AndroidUtilities.tryUnregisterReceiver(this, tagDeletedReceiver);
     }
 
     public void setSelectedItem(Filter item) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 834b4c8f5..c4f5d7110 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -315,7 +315,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
         super.onActivityCreated(savedInstanceState);
         // We have a menu item to show in action bar.
         setHasOptionsMenu(true);
-        System.err.println("Initializing fragment");
         syncActionHelper = new SyncActionHelper(getActivity(), this);
         setUpUiComponents();
         initializeData();
@@ -368,7 +367,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     protected void initializeData() {
         if (extras != null && extras.containsKey(TOKEN_FILTER)) {
             filter = extras.getParcelable(TOKEN_FILTER);
-            System.err.println("Filter on init: " + filter);
             extras.remove(TOKEN_FILTER); // Otherwise writing this filter to parcel gives infinite recursion
         } else {
             filter = CoreFilterExposer.buildInboxFilter(getResources());