From 7dbee8a4c2af900471c41258b42c8cd9312ac799 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 10 Jul 2012 16:37:28 -0700
Subject: [PATCH] Fixed tasks coming back from deletion on tablets when
 deleting while editing

---
 .../todoroo/astrid/actfm/EditPeopleControlSet.java  |  1 -
 .../todoroo/astrid/activity/TaskEditFragment.java   | 13 +++++++++++--
 .../todoroo/astrid/activity/TaskListFragment.java   | 13 +++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 0830e87e1..c37ef3ea1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -415,7 +415,6 @@ public class EditPeopleControlSet extends PopupControlSet {
 
             if (assignedIndex == 0) {
                 assignedIndex = findAssignedIndex(t, coreUsers, listUsers, astridUsers);
-                System.err.println("Returned index: " + assignedIndex);
             }
 
         } catch (JSONException e) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 86600a520..63c0d5c01 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -995,8 +995,17 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                                                 taskService.delete(model);
                                                 shouldSaveState = false;
                                                 showDeleteToast();
-                                                getActivity().setResult(Activity.RESULT_OK);
-                                                getActivity().onBackPressed();
+
+                                                Activity a = getActivity();
+                                                if (a instanceof TaskEditActivity) {
+                                                    getActivity().setResult(Activity.RESULT_OK);
+                                                    getActivity().onBackPressed();
+                                                } else if (a instanceof TaskListActivity) {
+                                                    discardButtonClick();
+                                                    TaskListFragment tlf = ((TaskListActivity) a).getTaskListFragment();
+                                                    if (tlf != null)
+                                                        tlf.refresh();
+                                                }
                                             }
                                         }).setNegativeButton(android.R.string.cancel, null).show();
     }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 303ff5db4..4f1fc8618 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -1104,9 +1104,18 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
                 }).setNegativeButton(android.R.string.cancel, null).show();
     }
 
-    protected void onTaskDelete(@SuppressWarnings("unused") Task task) {
-        // hook
+    protected void onTaskDelete(Task task) {
         decrementFilterCount();
+
+        Activity a = getActivity();
+        if (a instanceof AstridActivity) {
+            AstridActivity activity = (AstridActivity) a;
+            TaskEditFragment tef = activity.getTaskEditFragment();
+            if (tef != null) {
+                if (task.getId() == tef.model.getId())
+                    tef.discardButtonClick();
+            }
+        }
     }
 
     public void incrementFilterCount() {