From 8df81cf1823800a3c17d497b879cc205c7fc4018 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 8 May 2019 10:48:14 -0500
Subject: [PATCH] Make TaskListFragment filter private

---
 .../todoroo/astrid/activity/MainActivity.java |  4 ++--
 .../astrid/activity/TaskListFragment.java     | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 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 7fe16b887..eaf07df73 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -226,7 +226,7 @@ public class MainActivity extends InjectingAppCompatActivity
     } else {
       TaskListFragment existing = getTaskListFragment();
       openTaskListFragment(
-          existing == null || existing.filter != filter ? newTaskListFragment(filter) : existing);
+          existing == null || existing.getFilter() != filter ? newTaskListFragment(filter) : existing);
       openTask(filter);
     }
 
@@ -265,7 +265,7 @@ public class MainActivity extends InjectingAppCompatActivity
   private void openTaskListFragment(@NonNull TaskListFragment taskListFragment) {
     assertMainThread();
 
-    filter = taskListFragment.filter;
+    filter = taskListFragment.getFilter();
     navigationDrawer.setSelected(filter);
     applyTheme();
     FragmentManager fragmentManager = getSupportFragmentManager();
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 2279f0e5d..94d48ac69 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -147,7 +147,7 @@ public final class TaskListFragment extends InjectingFragment
   private TaskAdapter taskAdapter = null;
   private TaskListRecyclerAdapter recyclerAdapter;
   private final RefreshReceiver refreshReceiver = new RefreshReceiver();
-  protected Filter filter;
+  private Filter filter;
   private PublishSubject<String> searchSubject = PublishSubject.create();
   private Disposable searchDisposable;
   protected CompositeDisposable disposables;
@@ -162,7 +162,9 @@ public final class TaskListFragment extends InjectingFragment
 
   static TaskListFragment newTaskListFragment(Filter filter) {
     TaskListFragment fragment = new TaskListFragment();
-    fragment.filter = filter;
+    Bundle bundle = new Bundle();
+    bundle.putParcelable(EXTRA_FILTER, filter);
+    fragment.setArguments(bundle);
     return fragment;
   }
 
@@ -214,13 +216,7 @@ public final class TaskListFragment extends InjectingFragment
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    if (savedInstanceState != null) {
-      filter = savedInstanceState.getParcelable(EXTRA_FILTER);
-    }
-
-    if (filter == null) {
-      filter = BuiltInFilterExposer.getMyTasksFilter(getResources());
-    }
+    filter = getFilter();
 
     filter.setFilterQueryOverride(null);
 
@@ -235,7 +231,6 @@ public final class TaskListFragment extends InjectingFragment
   public void onSaveInstanceState(@NonNull Bundle outState) {
     super.onSaveInstanceState(outState);
 
-    outState.putParcelable(EXTRA_FILTER, filter);
     outState.putAll(recyclerAdapter.getSaveState());
   }
 
@@ -546,6 +541,14 @@ public final class TaskListFragment extends InjectingFragment
   }
 
   public Filter getFilter() {
+    Filter filter = null;
+    Bundle arguments = getArguments();
+    if (arguments != null) {
+      filter = arguments.getParcelable(EXTRA_FILTER);
+    }
+    if (filter == null) {
+      filter = BuiltInFilterExposer.getMyTasksFilter(getResources());
+    }
     return filter;
   }