From 77946d0c453f6543f6902ba5a98ddf8cd2f8902b Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 12 May 2020 21:38:03 +0200
Subject: [PATCH] Rename filters

---
 webext/background.js  | 15 +++++----------
 webext/js/defaults.js | 32 +++++++++++++-------------------
 webext/manifest.json  |  2 +-
 webext/options.html   |  2 --
 webext/options.js     | 24 ++----------------------
 5 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/webext/background.js b/webext/background.js
index a0847af..5cbdf37 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -11,7 +11,6 @@ var SysTrayX = {
 SysTrayX.Messaging = {
   accounts: [],
   countType: 0,
-  filtersExt: undefined,
   filters: undefined,
 
   init: function () {
@@ -53,7 +52,7 @@ SysTrayX.Messaging = {
     browser.folderChange.setCountType(Number(SysTrayX.Messaging.countType));
 
     //  Set the filters in the folderChange listener
-    browser.folderChange.setFilters(SysTrayX.Messaging.filtersExt);
+    browser.folderChange.setFilters(SysTrayX.Messaging.filters);
 
     //  Try to catch the window state
     browser.windows.onFocusChanged.addListener(SysTrayX.Window.focusChanged);
@@ -71,14 +70,10 @@ SysTrayX.Messaging = {
   storageChanged: function (changes, area) {
     //  Get the new preferences
 
-    if ("filtersExt" in changes && changes["filtersExt"].newValue) {
-      SysTrayX.Messaging.filtersExt = changes["filtersExt"].newValue;
-
-      browser.folderChange.setFilters(SysTrayX.Messaging.filtersExt);
-    }
-
     if ("filters" in changes && changes["filters"].newValue) {
       SysTrayX.Messaging.filters = changes["filters"].newValue;
+
+      browser.folderChange.setFilters(SysTrayX.Messaging.filters);
     }
 
     if ("minimizeOnClose" in changes && changes["minimizeOnClose"].newValue) {
@@ -412,13 +407,13 @@ async function start() {
   SysTrayX.Messaging.accounts = await browser.accounts.list();
 
   // Get the filters and convert old filters
-  const converted = await getFilters();
+  const converted = await checkFilters();
   if( converted ) {
     console.log("Filters converted to new format");
   }
 
   // Get the extended filters
-  SysTrayX.Messaging.filtersExt = await getFiltersExt();
+  SysTrayX.Messaging.filters = await getFilters();
 
   // Get the count type
   SysTrayX.Messaging.countType = await getCountType();
diff --git a/webext/js/defaults.js b/webext/js/defaults.js
index c0d7c19..3db9741 100644
--- a/webext/js/defaults.js
+++ b/webext/js/defaults.js
@@ -85,10 +85,10 @@ async function getMinimizeOnClose() {
 }
 
 //
-//  Get filters
+//  Check filters
 //
-async function getFilters() {
-  function getFiltersCb(result) {
+async function checkFilters() {
+  function checkFiltersCb(result) {
     let filters = result.filters || undefined;
 
     console.debug("Converting filters....")
@@ -97,41 +97,35 @@ async function getFilters() {
     //  Store extended query filters
     /*
     browser.storage.sync.set({
-      filtersExt: filters,
+      filters: filters,
     });
     */
 
     return true;
   }
 
-  function onFiltersError() {
+  function onCheckFiltersError() {
     return false;
   }
 
   const getFilters = browser.storage.sync.get("filters");
-  return await getFilters.then(getFiltersCb, onFiltersError);
+  return await getFilters.then(checkFiltersCb, onCheckFiltersError);
 }
 
 //
-//  Get extended filters
+//  Get filters
 //
-async function getFiltersExt() {
-  function getFiltersExtCb(result) {
-    const filtersExt = result.filtersExt || undefined;
-    console.debug("Accounts: " + SysTrayX.Messaging.accounts);
-
-
-
-    
-    return filtersExt;
+async function getFilters() {
+  function getFiltersCb(result) {
+    return result.filters || undefined;;
   }
 
-  function onFiltersExtError() {
+  function onFiltersError() {
     return undefined;
   }
 
-  const getFiltersExt = browser.storage.sync.get("filtersExt");
-  return await getFiltersExt.then(getFiltersExtCb, onFiltersExtError);
+  const getFiltersStorage = browser.storage.sync.get("filters");
+  return await getFiltersStorage.then(getFiltersCb, onFiltersError);
 }
 
 //
diff --git a/webext/manifest.json b/webext/manifest.json
index c6c4f56..59c6c60 100644
--- a/webext/manifest.json
+++ b/webext/manifest.json
@@ -10,7 +10,7 @@
     "gecko": {
       "id": "systray-x@Ximi1970",
       "strict_min_version": "68.0",
-      "strict_max_version": "76.*"
+      "strict_max_version": "77.*"
     }
   },
 
diff --git a/webext/options.html b/webext/options.html
index 870876f..cfcb5da 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -154,8 +154,6 @@
         <br />
       </form>
 
-      <div id="filters" data-filters="undefined"></div>
-
       <script src="js/options_mailform.js"></script>
     </div>
 
diff --git a/webext/options.js b/webext/options.js
index fbe31c4..1b1ed57 100644
--- a/webext/options.js
+++ b/webext/options.js
@@ -31,34 +31,18 @@ SysTrayX.SaveOptions = {
     });
 
     let filters = [];
-    let filtersExt = [];
     checkedFolders.forEach((folder) => {
       const mailFolderExt = JSON.parse(folder.value);
 
-      filtersExt.push({
+      filters.push({
         unread: true,
         folder: mailFolderExt,
       });
-
-      filters.push({
-        unread: true,
-        folder: {
-          accountId: mailFolderExt.accountId,
-          path: mailFolderExt.path,
-        },
-      });
     });
 
-    //  Store them in the options HTML
-    const filtersDiv = document.getElementById("filters");
-    filtersDiv.setAttribute("data-filters", JSON.stringify(filters));
+    console.debug("Filters: " + JSON.stringify(filters));
 
     //  Store extended query filters
-    browser.storage.sync.set({
-      filtersExt: filtersExt,
-    });
-
-    //  Store query filters
     browser.storage.sync.set({
       filters: filters,
     });
@@ -497,10 +481,6 @@ SysTrayX.RestoreOptions = {
         });
       });
     }
-
-    //  Store them in the options HTML
-    const filtersDiv = document.getElementById("filters");
-    filtersDiv.setAttribute("data-filters", JSON.stringify(filters));
   },
 
   onFiltersError: function (error) {