From ec6bba78080945f993c8f44474e24897f97700cd Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 5 Feb 2019 15:23:33 -0600
Subject: [PATCH] Dont close drawer or action mode on rotate

---
 .../com/todoroo/astrid/activity/MainActivity.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index aa6236cf1..c42598e7f 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -179,20 +179,28 @@ public class MainActivity extends InjectingAppCompatActivity
     outState.putParcelable(EXTRA_FILTER, filter);
   }
 
+  private void clearUi() {
+    finishActionMode();
+    navigationDrawer.closeDrawer();
+  }
+
   private Single<TaskListFragment> taskListFragmentSingle(Intent intent) {
     if (intent.hasExtra(OPEN_FILTER)) {
       filter = intent.getParcelableExtra(OPEN_FILTER);
       intent.removeExtra(OPEN_FILTER);
+      clearUi();
       return Single.fromCallable(() -> newTaskListFragment(filter));
     } else if (intent.hasExtra(LOAD_FILTER)) {
       String filter = intent.getStringExtra(LOAD_FILTER);
       intent.removeExtra(LOAD_FILTER);
+      clearUi();
       return Single.fromCallable(
           () -> newTaskListFragment(defaultFilterProvider.getFilterFromPreference(filter)));
     }
 
     TaskListFragment taskListFragment = getTaskListFragment();
     if (taskListFragment == null || taskListFragment.filter != filter) {
+      clearUi();
       return Single.fromCallable(() -> newTaskListFragment(filter));
     } else {
       return Single.just(taskListFragment);
@@ -215,9 +223,6 @@ public class MainActivity extends InjectingAppCompatActivity
       showDetailFragment();
     }
 
-    finishActionMode();
-    navigationDrawer.closeDrawer();
-
     Single<TaskListFragment> single =
         taskListFragmentSingle(intent)
             .subscribeOn(Schedulers.io())
@@ -310,7 +315,7 @@ public class MainActivity extends InjectingAppCompatActivity
   }
 
   private void loadTaskEditFragment(TaskEditFragment taskEditFragment) {
-    finishActionMode();
+    clearUi();
 
     getSupportFragmentManager()
         .beginTransaction()