From bb1f911d8f40a32afe14c83874374f7041353aaa Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 19 Oct 2019 11:45:34 +0200
Subject: [PATCH] Filter improvement/fix

---
 .../eu/faircode/email/FragmentMessages.java   | 34 +++++--------------
 app/src/main/res/menu/menu_messages.xml       | 34 +++++++++----------
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 3b47010045..7d57da28d9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -611,7 +611,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             public void onClick(View view) {
                 boolean filter = prefs.getBoolean("filter_seen", true);
-                onMenuFilterSeen(!filter);
+                onMenuFilter("filter_seen", !filter);
             }
         });
 
@@ -619,7 +619,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             public void onClick(View view) {
                 boolean filter = prefs.getBoolean("filter_unflagged", true);
-                onMenuFilterUnflagged(!filter);
+                onMenuFilter("filter_unflagged", !filter);
             }
         });
 
@@ -627,7 +627,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             public void onClick(View view) {
                 boolean filter = prefs.getBoolean("filter_snoozed", true);
-                onMenuFilterSnoozed(!filter);
+                onMenuFilter("filter_snoozed", !filter);
             }
         });
 
@@ -2685,15 +2685,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 return true;
 
             case R.id.menu_filter_seen:
-                onMenuFilterSeen(!item.isChecked());
+                onMenuFilter("filter_seen", !item.isChecked());
                 return true;
 
             case R.id.menu_filter_unflagged:
-                onMenuFilterUnflagged(!item.isChecked());
+                onMenuFilter("filter_unflagged", !item.isChecked());
                 return true;
 
             case R.id.menu_filter_snoozed:
-                onMenuFilterSnoozed(!item.isChecked());
+                onMenuFilter("filter_snoozed", !item.isChecked());
                 return true;
 
             case R.id.menu_filter_duplicates:
@@ -2760,27 +2760,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         loadMessages(true);
     }
 
-    private void onMenuFilterSeen(boolean filter) {
+    private void onMenuFilter(String name, boolean filter) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        prefs.edit().putBoolean("filter_seen", filter).apply();
-        getActivity().invalidateOptionsMenu();
-        if (selectionTracker != null)
-            selectionTracker.clearSelection();
-        loadMessages(true);
-    }
-
-    private void onMenuFilterUnflagged(boolean filter) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        prefs.edit().putBoolean("filter_unflagged", filter).apply();
-        getActivity().invalidateOptionsMenu();
-        if (selectionTracker != null)
-            selectionTracker.clearSelection();
-        loadMessages(true);
-    }
-
-    private void onMenuFilterSnoozed(boolean filter) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        prefs.edit().putBoolean("filter_snoozed", filter).apply();
+        prefs.edit().putBoolean(name, filter).apply();
         getActivity().invalidateOptionsMenu();
         if (selectionTracker != null)
             selectionTracker.clearSelection();
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 27c3f4ddaf..68b27c05fb 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -57,27 +57,25 @@
         android:title="@string/title_filter"
         app:showAsAction="ifRoom">
         <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/menu_filter_seen"
-                    android:checkable="true"
-                    android:title="@string/title_filter_seen" />
+            <item
+                android:id="@+id/menu_filter_seen"
+                android:checkable="true"
+                android:title="@string/title_filter_seen" />
 
-                <item
-                    android:id="@+id/menu_filter_unflagged"
-                    android:checkable="true"
-                    android:title="@string/title_filter_unflagged" />
+            <item
+                android:id="@+id/menu_filter_unflagged"
+                android:checkable="true"
+                android:title="@string/title_filter_unflagged" />
 
-                <item
-                    android:id="@+id/menu_filter_snoozed"
-                    android:checkable="true"
-                    android:title="@string/title_filter_hidden" />
+            <item
+                android:id="@+id/menu_filter_snoozed"
+                android:checkable="true"
+                android:title="@string/title_filter_hidden" />
 
-                <item
-                    android:id="@+id/menu_filter_duplicates"
-                    android:checkable="true"
-                    android:title="@string/title_filter_duplicates" />
-            </group>
+            <item
+                android:id="@+id/menu_filter_duplicates"
+                android:checkable="true"
+                android:title="@string/title_filter_duplicates" />
         </menu>
     </item>