From a804c51c88c6b88eb9f0f2b2ee762a05698e73f1 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 17 Feb 2012 20:20:27 -0800
Subject: [PATCH] Fixed a bug where push task could be called in infinite
 recursion by activity tab, other small things

---
 .../com/todoroo/astrid/notes/EditNoteActivity.java       | 3 ++-
 astrid/res/layout/control_set_assigned.xml               | 1 +
 .../com/todoroo/astrid/activity/TaskListActivity.java    | 2 +-
 astrid/src/com/todoroo/astrid/ui/QuickAddBar.java        | 9 ++++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 5280e5790..81ae8e8dd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -406,11 +406,12 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         }
 
         // push task if it hasn't been pushed
-        if(task.getValue(Task.REMOTE_ID) == 0) {
+        if(task.getValue(Task.REMOTE_ID) == 0 && !TextUtils.isEmpty(task.getValue(Task.TITLE))) {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
                     actFmSyncService.pushTask(task.getId());
+                    task = PluginServices.getTaskService().fetchById(task.getId(), Task.NOTES, Task.ID, Task.REMOTE_ID, Task.TITLE);
                     refreshData(false, callback);
                 }
             }).start();
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
index 26206ccc7..76a460c9d 100644
--- a/astrid/res/layout/control_set_assigned.xml
+++ b/astrid/res/layout/control_set_assigned.xml
@@ -15,6 +15,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="2dip"
           android:layout_weight="1"
+          android:textColor="@android:color/black"
           android:hint="@string/actfm_person_hint" />
         <ImageButton
           android:id="@+id/assigned_clear"
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 1fd14eeba..79451c127 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -430,7 +430,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             tlf.refresh();
     }
 
-    protected void switchToAssignedFilter(final String assignedEmail) {
+    public void switchToAssignedFilter(final String assignedEmail) {
         TaskListFragment tlf = getTaskListFragment();
         if (tlf != null && !tlf.isFilter()) {
             DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index a7330a2ac..5ceb54ed7 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -32,6 +32,7 @@ import com.todoroo.astrid.actfm.EditPeopleControlSet;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.TaskEditFragment;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.activity.TaskListFragment.OnTaskListItemClickedListener;
 import com.todoroo.astrid.data.TagData;
@@ -242,7 +243,8 @@ public class QuickAddBar extends LinearLayout {
         try {
             if (title != null)
                 title = title.trim();
-            if (!peopleControl.willBeAssignedToMe() && !actFmPreferenceService.isLoggedIn()) {
+            boolean assignedToMe = peopleControl.willBeAssignedToMe();
+            if (!assignedToMe && !actFmPreferenceService.isLoggedIn()) {
                 DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface d, int which) {
@@ -278,6 +280,8 @@ public class QuickAddBar extends LinearLayout {
             peopleControl.saveSharingSettings(null);
             taskService.save(task);
 
+            String assignedTo = peopleControl.getAssignedToString();
+
             resetControlSets();
 
             boolean gcalCreateEventEnabled = Preferences.getStringValue(R.string.gcal_p_default) != null
@@ -295,6 +299,9 @@ public class QuickAddBar extends LinearLayout {
             if(title.length() > 0)
                 fragment.showTaskEditHelpPopover();
 
+            if (activity instanceof TaskListActivity && !assignedToMe)
+                ((TaskListActivity) activity).switchToAssignedFilter(assignedTo);
+
             TextView quickAdd = (TextView) findViewById(R.id.quickAddText);
             quickAdd.setText(""); //$NON-NLS-1$