Persist conversation list filter switches

Author: lobre

data/io.elementary.mail.gschema.xml

@@ -32,6 +32,16 @@
       <summary>Whether to always load remote images without prompting</summary>
       <description>Whether to always load remote images without prompting</description>
     </key>
+    <key name="hide-read-conversations" type="b">
+      <default>false</default>
+      <summary>Whether to hide read conversations in the list</summary>
+      <description>Stores the last used state of the “Hide read conversations” filter</description>
+    </key>
+    <key name="hide-unstarred-conversations" type="b">
+      <default>false</default>
+      <summary>Whether to hide unstarred conversations in the list</summary>
+      <description>Stores the last used state of the “Hide unstarred conversations” filter</description>
+    </key>
     <key name="remote-images-whitelist" type="as">
       <default>[]</default>
       <summary>A list of sender addresses for which remote images will be automatically loaded</summary>
@@ -51,4 +61,3 @@
     </key>
   </schema>
 </schemalist>
-

src/ConversationList/ConversationList.vala

@@ -41,13 +41,16 @@ public class Mail.ConversationList : Gtk.Box {
     private Granite.SwitchModelButton hide_unstarred_switch;
     private Gtk.MenuButton filter_button;
     private Gtk.Stack refresh_stack;
+    private GLib.Settings settings;
 
     private uint mark_read_timeout_id = 0;
 
     construct {
         orientation = VERTICAL;
         get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
 
+        settings = new GLib.Settings ("io.elementary.mail");
+
         conversations = new Gee.HashMap<string, ConversationItemModel> ();
         folders = new Gee.HashMap<string, Camel.Folder> ();
         folder_info_flags = new Gee.HashMap<string, Camel.FolderInfoFlags> ();
@@ -88,8 +91,19 @@ public class Mail.ConversationList : Gtk.Box {
         };
 
         hide_read_switch = new Granite.SwitchModelButton (_("Hide read conversations"));
-
         hide_unstarred_switch = new Granite.SwitchModelButton (_("Hide unstarred conversations"));
+        settings.bind (
+            "hide-read-conversations",
+            hide_read_switch,
+            "active",
+            SettingsBindFlags.DEFAULT | SettingsBindFlags.SET
+        );
+        settings.bind (
+            "hide-unstarred-conversations",
+            hide_unstarred_switch,
+            "active",
+            SettingsBindFlags.DEFAULT | SettingsBindFlags.SET
+        );
 
         var filter_menu_popover_box = new Gtk.Box (VERTICAL, 0) {
             margin_bottom = 3,
@@ -163,7 +177,7 @@ public class Mail.ConversationList : Gtk.Box {
         add (scrolled_window);
         add (conversation_action_bar);
 
-        search_entry.search_changed.connect (() => load_folder.begin (folder_info_per_account));
+        search_entry.search_changed.connect (() => reload_active_folder ());
 
         list_box.row_activated.connect ((row) => {
             if (mark_read_timeout_id != 0) {
@@ -203,9 +217,15 @@ public class Mail.ConversationList : Gtk.Box {
             }
         });
 
-        hide_read_switch.toggled.connect (() => load_folder.begin (folder_info_per_account));
+        hide_read_switch.notify["active"].connect (() => reload_active_folder ());
 
-        hide_unstarred_switch.toggled.connect (() => load_folder.begin (folder_info_per_account));
+        hide_unstarred_switch.notify["active"].connect (() => reload_active_folder ());
+    }
+
+    private void reload_active_folder () {
+        if (folder_info_per_account != null) {
+            load_folder.begin (folder_info_per_account);
+        }
     }
 
     private static void set_thread_flag (Camel.FolderThreadNode? node, Camel.MessageFlags flag) {