From 881ab9eae82416d958de33dc29912f6f7dc888a8 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 9 Feb 2016 11:58:29 -0600
Subject: [PATCH] Pop task edit fragment immediately

---
 build.gradle                                     |  4 ++--
 .../astrid/activity/TaskListActivity.java        | 16 ++++++----------
 .../todoroo/astrid/ui/EditTitleControlSet.java   |  5 -----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index cd46265dd..eab4a37f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        versionCode 391
-        versionName "4.8.4"
+        versionCode 392
+        versionName "4.8.5"
         minSdkVersion 14
         targetSdkVersion 23
     }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 220c73e2b..e449c7442 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -300,16 +300,12 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
             return;
         }
 
-        if (getTaskEditFragment() != null) {
-            getTaskEditFragment().discardButtonClick();
-            return;
-        }
-
-        if (isFinishing()) {
-            return;
+        TaskEditFragment taskEditFragment = getTaskEditFragment();
+        if (taskEditFragment != null) {
+            taskEditFragment.discardButtonClick();
+        } else {
+            super.onBackPressed();
         }
-
-        super.onBackPressed();
     }
 
     @Override
@@ -431,7 +427,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
 
     @Override
     public void taskEditFinished() {
-        getFragmentManager().popBackStack(TaskEditFragment.TAG_TASKEDIT_FRAGMENT, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        getFragmentManager().popBackStackImmediate(TaskEditFragment.TAG_TASKEDIT_FRAGMENT, FragmentManager.POP_BACK_STACK_INCLUSIVE);
         hideKeyboard();
     }
 
diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 4cd83a734..a7199891d 100644
--- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -18,7 +18,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
 import com.google.common.base.Strings;
-import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TaskService;
 
@@ -185,8 +184,4 @@ public class EditTitleControlSet extends TaskEditControlFragment {
             taskService.setComplete(task, isComplete);
         }
     }
-
-    public void hideKeyboard() {
-        AndroidUtilities.hideSoftInputForViews(getActivity(), editText);
-    }
 }