Pop task edit fragment immediately

build.gradle

@@ -27,8 +27,8 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        versionCode 391
+        versionCode 392
-        versionName "4.8.4"
+        versionName "4.8.5"
         minSdkVersion 14
         targetSdkVersion 23
     }

src/main/java/com/todoroo/astrid/activity/TaskListActivity.java

@@ -300,17 +300,13 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
             return;
         }
 
-        if (getTaskEditFragment() != null) {
+        TaskEditFragment taskEditFragment = getTaskEditFragment();
-            getTaskEditFragment().discardButtonClick();
+        if (taskEditFragment != null) {
-            return;
+            taskEditFragment.discardButtonClick();
-        }
+        } else {
-
-        if (isFinishing()) {
-            return;
-        }
-
             super.onBackPressed();
         }
+    }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -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();
     }
 

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);
-    }
 }