From f8517daf2531bbd0b9b899f55ea39c8a407250e4 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 15:49:39 +0100
Subject: [PATCH 01/25] allow alt lookup for keepass in /usr/lib

---
 xul-ext/modules/utils.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/xul-ext/modules/utils.js b/xul-ext/modules/utils.js
index b0ef469..8e46b0c 100644
--- a/xul-ext/modules/utils.js
+++ b/xul-ext/modules/utils.js
@@ -27,6 +27,7 @@ const { KeeFoxLog } = ChromeUtils.import("resource://kfmod/KFLogger.js");
 const { KFExtension } = ChromeUtils.import("resource://kfmod/KFExtension.js");
 const { BigInteger } = ChromeUtils.import("resource://kfmod/biginteger.js");
 const { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // constructor
 function Utils()
@@ -155,12 +156,24 @@ Utils.prototype = {
                 this._KFLog.debug("Checking KeePass installation location from filesystem");
 
                 // Get the users home directory
-                var dirService = Components.classes["@mozilla.org/file/directory_service;1"].  
-                  getService(Components.interfaces.nsIProperties);   
-                var keePassFolder = dirService.get("Home", Components.interfaces.nsIFile); // returns an nsIFile object
+                var keePassFolder = Services.dirsvc.get("Home", Components.interfaces.nsIFile); // returns an nsIFile object
                 keePassFolder.append("KeePass");
                 var keePassFile = keePassFolder.clone();
                 keePassFile.append("KeePass.exe");
+                if (!keePassFile.exists())
+                {
+                    // try a location like /usr/lib/thunderbird/../keepass2
+                    // eg /usr/lib/keepass2 but a workaround seems needed as 
+                    // the parameter for dirsvc.get() is a constant
+                    // see https://gist.github.com/Noitidart/715840fa5008ee032017 for more details
+                    this._KFLog.debug("***was testing "+keePassFolder.path);
+                    keePassFolder = Services.dirsvc.get("GreD", Components.interfaces.nsIFile);
+                    this._KFLog.debug("***is testing "+keePassFolder.path);
+                    keePassFolder.append("..");
+                    keePassFolder.append("keepass2");
+                    keePassFile = keePassFolder.clone();
+                    keePassFile.append("KeePass.exe");  
+                }
                 if (keePassFile.exists())
                 {
                     keePassLocation = keePassFolder.path;
@@ -420,7 +433,7 @@ Utils.prototype = {
         else
             this._KFLog.debug("trying to find an already open tab with the requested url");
         var found = false;
-        
+
         var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                    .getService(Components.interfaces.nsIWindowMediator);
         try

From 58565be6be33c97f6c9610b323ccc59a63b63def Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 15:50:14 +0100
Subject: [PATCH 02/25] fix : avoid window.keefox_org is undefined

---
 xul-ext/modules/kprpcClient.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xul-ext/modules/kprpcClient.js b/xul-ext/modules/kprpcClient.js
index 3910512..18c8b1b 100644
--- a/xul-ext/modules/kprpcClient.js
+++ b/xul-ext/modules/kprpcClient.js
@@ -524,9 +524,11 @@ kprpcClient.prototype.constructor = kprpcClient;
   	this.identifyToClient = function(data) {
         var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                     .getService(Components.interfaces.nsIWindowMediator);
-        var window = wm.getMostRecentWindow("common-dialog") ||
-                        wm.getMostRecentWindow("navigator:browser") ||
-                        wm.getMostRecentWindow("mail:3pane");
+        var window = wm.getMostRecentWindow("navigator:browser") ||
+        wm.getMostRecentWindow("mail:3pane") ||
+        // to avoid the "JavaScript error: resource://kfmod/kprpcClient.js, line 537: TypeError: window.keefox_org is undefined"
+        // -> move common-dialog to the end of window lookup
+        wm.getMostRecentWindow("common-dialog");
 
         // get the user to type in the one-time password
         let prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]

From 0871d79ad6c2c72075f60de07fda14630b7dd00f Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 15:50:50 +0100
Subject: [PATCH 03/25] usage comments

---
 xul-ext/modules/KF.js      | 19 +++++++++++++++++++
 xul-ext/modules/locales.js |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/xul-ext/modules/KF.js b/xul-ext/modules/KF.js
index 841fa3b..3359ee3 100644
--- a/xul-ext/modules/KF.js
+++ b/xul-ext/modules/KF.js
@@ -432,6 +432,10 @@ KeeFox.prototype = {
             try
             {
                 var win = enumerator.getNext();
+                if (win.keefox_win === undefined) {
+                    this._KFLog.debug("win.keefox_win === undefined");
+                    continue;
+                }
                 win.keefox_win.mainUI.resetSearchInterface();
                 win.keefox_win.mainUI.removeLogins();
                 win.keefox_win.context.removeLogins();
@@ -825,6 +829,19 @@ KeeFox.prototype = {
         }
     },
 
+    /**
+     * https://github.com/kee-org/keepassrpc/blob/v1.14.0/KeePassRPC/KeePassRPCService.cs
+     * @param {*} fullURL The URLs to search for. Host must be lower case as per the URI specs. Other parts are case sensitive.
+     * @param {*} formSubmitURL The action URL.
+     * @param {*} httpRealm The HTTP realm.
+     * @param {*} uniqueID The unique ID of a particular entry we want to retrieve.
+     * @param {*} dbFileName The unique ID of the root group of the database we want to search. Empty string = search all DBs
+     * @param {*} freeText A string to search for in all entries. E.g. title, username (may change)
+     * @param {*} username Limit a search for URL to exact username matches only
+     * @param {*} callback 
+     * @param {*} callbackData 
+     * @returns 
+     */
     findLogins: function(fullURL, formSubmitURL, httpRealm, uniqueID, dbFileName, freeText, username, callback, callbackData)
     {
         try
@@ -991,6 +1008,8 @@ KeeFox.prototype = {
                 case "logMethodStdOut":
                 case "logSensitiveData":
                     // Allow the change to go ahead but warn the user (in case they did not understand the change that was made)
+                    // Remark : strange here to refer to keefox_org from window, other cases directly uses keefox_org
+                    // -> don't have any test scenario to see if it's working or not
                     window.keefox_org._KFLog.configureFromPreferences();
                     utils.oneOffSensitiveLogCheckHandler();
                     break;
diff --git a/xul-ext/modules/locales.js b/xul-ext/modules/locales.js
index 1d2a7a8..25a7510 100644
--- a/xul-ext/modules/locales.js
+++ b/xul-ext/modules/locales.js
@@ -368,8 +368,9 @@ Localisation.prototype = {
                 args = elements[i][1];
             }
 
-            if (!element)
+            if (!element) {
                 continue;
+            }
 
             // Replace within text content too. Assumes there are no other subnodes. May need to be more clever here.
             if (element.childNodes != null && element.childNodes.length > 0)

From 5d478bfc5aaafbbb5b7eae774c16a986ba507d88 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 15:53:36 +0100
Subject: [PATCH 04/25] fix : avoid keefox_win.mainUI is undefined

---
 xul-ext/chrome/content/keefoxWin.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xul-ext/chrome/content/keefoxWin.js b/xul-ext/chrome/content/keefoxWin.js
index 3f46186..2e216c5 100644
--- a/xul-ext/chrome/content/keefoxWin.js
+++ b/xul-ext/chrome/content/keefoxWin.js
@@ -170,8 +170,9 @@ keefox_win.mainEventHandler =
                 var observerService = Cc["@mozilla.org/observer-service;1"].
                               getService(Ci.nsIObserverService);
                 observerService.removeObserver(this, "sessionstore-windows-restored", false);
-
-                keefox_win.mainUI.shutdown();
+                if (keefox_win.mainUI !== undefined) {
+                    keefox_win.mainUI.shutdown();
+                }
                 keefox_win.Logger.info("Window shut down.");
                 return;
             default:

From 80ee637e3dfae6584b90237df6a4d661e53f2666 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 15:54:56 +0100
Subject: [PATCH 05/25] run target : uses web-ext to launch extension

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index 9e3ca29..1e193cb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
 
 PREFIX	:= /usr
 DATADIR	:= $(PREFIX)/share
+# the profile dir is copied and left unmodified by web-ext
+PROFILE := /home/xavier/.thunderbird/6ujxy9ck.default-release-2/
 
 # UUID below is for Thunderbird
 TB_EXT_DIR := $(DATADIR)/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}
@@ -17,3 +19,8 @@ clean:
 install: all
 	install -d $(DESTDIR)$(TB_EXT_DIR)
 	install --mode=644 *.xpi $(DESTDIR)$(TB_EXT_DIR)
+
+run:
+	web-ext run --verbose --firefox=/usr/bin/thunderbird --firefox-profile=$(PROFILE) -s xul-ext/
+lint:
+	web-ext lint -s xul-ext/
\ No newline at end of file

From 3a416df1ad8b00b3c03056d99db041dc395b2a7d Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 21:18:05 +0100
Subject: [PATCH 06/25] tb68/changes#less-than-progressmeter-greater-than

---
 xul-ext/chrome/content/install.xul | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xul-ext/chrome/content/install.xul b/xul-ext/chrome/content/install.xul
index e5b8bbd..745b767 100644
--- a/xul-ext/chrome/content/install.xul
+++ b/xul-ext/chrome/content/install.xul
@@ -295,7 +295,7 @@ IC7 and 8: Currently same as IC3/6 but will display different text to user
             <vbox id="installProgressView" hidden="true">
               <vbox id="IC1setupNETdownloading" hidden="true">
                 <description id="desc_IC1setupNETdownloading">%-KeeFox_Install_IC1setupNETdownloading.description-%</description>
-                <progressmeter id="IC1setupNETdownloadingProgressBar" mode="determined" value="0"/>
+                <html:progress max="100" id="IC1setupNETdownloadingProgressBar" mode="determined" value="0"/>
                 <button id="but_IC1setupNETdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
                         oncommand="cancelCurrentDownload();"/>
               </vbox>
@@ -305,7 +305,7 @@ IC7 and 8: Currently same as IC3/6 but will display different text to user
 
               <vbox id="IC1setupKPdownloading" hidden="true">
                 <description id="desc_IC1setupKPdownloading">%-KeeFox_Install_IC1setupKPdownloading.description-%</description>
-                <progressmeter id="IC1setupKPdownloadingProgressBar" mode="determined" value="0"/>
+                <html:progress max="100" id="IC1setupKPdownloadingProgressBar" mode="determined" value="0"/>
                 <button id="but_IC1setupKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
                         oncommand="cancelCurrentDownload();"/>
               </vbox>
@@ -319,7 +319,7 @@ IC7 and 8: Currently same as IC3/6 but will display different text to user
 
               <vbox id="IC2setupKPdownloading" hidden="true">
                 <description id="desc_IC2setupKPdownloading">%-KeeFox_Install_IC2setupKPdownloading.description-%</description>
-                <progressmeter id="IC2setupKPdownloadingProgressBar" mode="determined" value="0"/>
+                <html:progress max="100" id="IC2setupKPdownloadingProgressBar" mode="determined" value="0"/>
                 <button id="but_IC2setupKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
                         oncommand="cancelCurrentDownload();"/>
               </vbox>
@@ -337,7 +337,7 @@ IC7 and 8: Currently same as IC3/6 but will display different text to user
 
               <vbox id="IC5zipKPdownloading" hidden="true">
                 <description id="desc_IC5zipKPdownloading">%-KeeFox_Install_IC5zipKPdownloading.description-%</description>
-                <progressmeter id="IC5zipKPdownloadingProgressBar" mode="determined" value="0"/>
+                <html:progress max="100" id="IC5zipKPdownloadingProgressBar" mode="determined" value="0"/>
                 <button id="lab_IC5zipKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
                         oncommand="cancelCurrentDownload();"/>
               </vbox>

From 73e778a403b5ebf6f420ed70872a2f40631df6d5 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 21:18:31 +0100
Subject: [PATCH 07/25] 
 tb68/changes#less-than-textbox-multiline-true-greater-than

---
 xul-ext/chrome/content/UninstallHelper.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xul-ext/chrome/content/UninstallHelper.js b/xul-ext/chrome/content/UninstallHelper.js
index c725cf0..9a0a496 100644
--- a/xul-ext/chrome/content/UninstallHelper.js
+++ b/xul-ext/chrome/content/UninstallHelper.js
@@ -214,14 +214,12 @@ keefox_win.UninstallHelper.prototype =
         extraLabel.setAttribute("control", "keefox-uninstall-helper-feedback-extra");
         container.appendChild(extraLabel);
 
-        // FIXME: textbox multiline="true" is removed in TB68
-        // https://developer.thunderbird.net/add-ons/updates/tb68#less-than-textbox-multiline-true-greater-than
-        let extra = this.doc.createElement('textbox');
+        let extra = this.doc.createElementNS("http://www.w3.org/1999/xhtml",'textarea');
         extra.setAttribute("id","keefox-uninstall-helper-feedback-extra");
-        extra.setAttribute("multiline","true");
         extra.addEventListener("keypress", pnCountNoteChars, false);
         container.appendChild(extra);
 
+
         if (!varients.smallScreen && varients.whyLocation == 2)
             attachWhy.call(this);
 

From 562f0471527bb4cd9556f04a93892aaa17435504 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 18:19:14 +0100
Subject: [PATCH 08/25] tb68/changes#changed-event-behavior

---
 xul-ext/chrome/content/famsOptions.js  | 4 ++++
 xul-ext/chrome/content/famsOptions.xul | 1 -
 xul-ext/chrome/content/siteOptions.js  | 8 ++++++++
 xul-ext/chrome/content/siteOptions.xul | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xul-ext/chrome/content/famsOptions.js b/xul-ext/chrome/content/famsOptions.js
index 6f84b13..6ae342a 100644
--- a/xul-ext/chrome/content/famsOptions.js
+++ b/xul-ext/chrome/content/famsOptions.js
@@ -62,6 +62,10 @@ function onLoad()
             event.preventDefault();
         }
     });
+    document.addEventListener("dialogcancel", event => {
+        event.preventDefault(); // Prevent the dialog closing.
+        return;
+    });
     go();
 }
 
diff --git a/xul-ext/chrome/content/famsOptions.xul b/xul-ext/chrome/content/famsOptions.xul
index 7738c19..b4d8b1f 100644
--- a/xul-ext/chrome/content/famsOptions.xul
+++ b/xul-ext/chrome/content/famsOptions.xul
@@ -26,7 +26,6 @@
 <dialog id="famsOptions" title="Message download and notification options"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept,cancel"
-        ondialogcancel="return;"
         onload="onLoad();">
   <script type="application/javascript" src="chrome://keefox/content/famsOptions.js"/>
   <grid flex="1" >
diff --git a/xul-ext/chrome/content/siteOptions.js b/xul-ext/chrome/content/siteOptions.js
index fe86ea4..23ad54f 100644
--- a/xul-ext/chrome/content/siteOptions.js
+++ b/xul-ext/chrome/content/siteOptions.js
@@ -69,6 +69,14 @@ function onLoad()
 
     configMan = mainWindow.keefox_org.config;
     document.title = mainWindow.keefox_org.locale.$STR("KeeFox-site-options-title");
+    document.addEventListener("dialogextra1", event => {
+        event.preventDefault(); // Prevent the dialog closing.
+        window.close();
+    });
+    document.addEventListener("dialogcancel", event => {
+        event.preventDefault(); // Prevent the dialog closing.
+        return;
+    });
 
     go(selectURL);
 }
diff --git a/xul-ext/chrome/content/siteOptions.xul b/xul-ext/chrome/content/siteOptions.xul
index 69fbce3..09781de 100644
--- a/xul-ext/chrome/content/siteOptions.xul
+++ b/xul-ext/chrome/content/siteOptions.xul
@@ -26,8 +26,8 @@
 -->
 <dialog id="KeeFoxSiteOptions" title=""
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        buttons="extra1" buttonlabelextra1="Close" ondialogextra1 ="window.close();"
-        ondialogcancel="return;"
+        buttons="extra1" 
+        buttonlabelextra1="Close" 
         onload="onLoad();">
   <script type="application/javascript" src="chrome://keefox/content/siteOptions.js"/>
   <grid flex="1" >

From 61d7b578a4a43fcfc06457a2079b9cbaef031664 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 18:48:27 +0100
Subject: [PATCH 09/25] tb68/changes#nsistringbundleservice

---
 xul-ext/chrome/content/KFcommonDialog.js | 28 ++++++------------------
 xul-ext/chrome/content/gdata-provider.js |  8 ++-----
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index 36aab27..8851559 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -47,9 +47,7 @@ var keeFoxDialogManager = {
     __promptBundle : null, // String bundle for L10N
     get _promptBundle() {
         if (!this.__promptBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__promptBundle = bunService.createBundle(
+            this.__promptBundle = Services.strings.createBundle(
                 "chrome://global/locale/prompts.properties");
             if (!this.__promptBundle)
                 throw "Prompt string bundle not present!";
@@ -60,9 +58,7 @@ var keeFoxDialogManager = {
     __cdBundle : null, // String bundle for L10N
     get _cdBundle() {
         if (!this.__cdBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                             getService(Components.interfaces.nsIStringBundleService);
-            this.__cdBundle = bunService.createBundle(
+            this.__cdBundle = Services.strings.createBundle(
                         "chrome://global/locale/commonDialogs.properties");
             if (!this.__cdBundle)
                 throw "Common Dialogs string bundle not present!";
@@ -73,9 +69,7 @@ var keeFoxDialogManager = {
     __messengerBundle : null, // string bundle for thunderbird l10n
     get _messengerBundle() {    
         if (!this.__messengerBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__messengerBundle = bunService.createBundle(
+            this.__messengerBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/messenger.properties");
             if (!this.__messengerBundle)
                 throw "Messenger string bundle not present!";
@@ -86,9 +80,7 @@ var keeFoxDialogManager = {
     __localMsgsBundle : null, // string bundle for thunderbird l10n
     get _localMsgsBundle() {    
         if (!this.__localMsgsBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__localMsgsBundle = bunService.createBundle(
+            this.__localMsgsBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/localMsgs.properties");
             if (!this.__localMsgsBundle)
                 throw "localMsgs string bundle not present!";
@@ -99,9 +91,7 @@ var keeFoxDialogManager = {
     __imapMsgsBundle : null, // string bundle for thunderbird l10n
     get _imapMsgsBundle() {    
         if (!this.__imapMsgsBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__imapMsgsBundle = bunService.createBundle(
+            this.__imapMsgsBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/imapMsgs.properties");
             if (!this.__imapMsgsBundle)
                 throw "imapMsgs string bundle not present!";
@@ -128,9 +118,7 @@ var keeFoxDialogManager = {
     __newsBundle : null, // string bundle for thunderbird l10n
     get _newsBundle() {    
         if (!this.__newsBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__newsBundle = bunService.createBundle(
+            this.__newsBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/news.properties");
             if (!this.__newsBundle)
                 throw "news string bundle not present!";
@@ -141,9 +129,7 @@ var keeFoxDialogManager = {
     __composeBundle : null, // string bundle for thunderbird l10n
     get _composeBundle() {    
         if (!this.__composeBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__composeBundle = bunService.createBundle(
+            this.__composeBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/messengercompose/composeMsgs.properties");
             if (!this.__composeBundle)
                 throw "Compose Message string bundle not present!";
diff --git a/xul-ext/chrome/content/gdata-provider.js b/xul-ext/chrome/content/gdata-provider.js
index 7d0032c..f30a47e 100644
--- a/xul-ext/chrome/content/gdata-provider.js
+++ b/xul-ext/chrome/content/gdata-provider.js
@@ -43,9 +43,7 @@ var keeFoxGDataProviderHelper = {
     __messengerBundle : null, // string bundle for thunderbird l10n
     get _messengerBundle() {
         if (!this.__messengerBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__messengerBundle = bunService.createBundle(
+            this.__messengerBundle = Services.strings.createBundle(
                 "chrome://messenger/locale/messenger.properties");
             if (!this.__messengerBundle)
                 throw "Messenger string bundle not present!";
@@ -56,9 +54,7 @@ var keeFoxGDataProviderHelper = {
     __gdataBundle : null, // String bundle for L10N
     get _gdataBundle() {
         if (!this.__gdataBundle) {
-            var bunService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-                getService(Components.interfaces.nsIStringBundleService);
-            this.__gdataBundle = bunService.createBundle(
+            this.__gdataBundle = Services.strings.createBundle(
                 "chrome://gdata-provider/locale/gdata.properties");
             if (!this.__gdataBundle)
                 throw "GData string bundle not present!";

From b671d153f077ce0df6dfa225f5814f5bf8e52b58 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 18:55:45 +0100
Subject: [PATCH 10/25] tb68/changes#nsistreamlistener

---
 xul-ext/modules/session.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/xul-ext/modules/session.js b/xul-ext/modules/session.js
index 2b5a498..d17d755 100644
--- a/xul-ext/modules/session.js
+++ b/xul-ext/modules/session.js
@@ -317,13 +317,32 @@ KPRPCHTTPStreamListener.prototype = {
    },
 
   // don't expect to receive any data but just in case, we want to handle it properly
-  onDataAvailable: function (aRequest, aStream, aSourceOffset, aLength) {
+  onDataAvailable: function (...args) {
+    let /*aRequest,*/ aStream, /*aSourceOffset,*/ aLength;
     log.debug("HTTP data available.");
     var scriptableInputStream = 
       Components.classes["@mozilla.org/scriptableinputstream;1"]
         .createInstance(Components.interfaces.nsIScriptableInputStream);
-    scriptableInputStream.init(aStream);
-    scriptableInputStream.read(aLength);
+    let hasArgument = false;
+    // The old API passes the stream as third parameter.
+    if (args[2] instanceof Ci.nsIInputStream){
+        aStream = args[2];
+        aLength = args[4];
+        hasArgument = true;
+    }
+    // The new API uses the second parameter.
+    if (args[1] instanceof Ci.nsIInputStream){
+        aStream = args[1];
+        aLength = args[3];
+        hasArgument = true;
+    }
+    if (hasArgument) {
+        scriptableInputStream.init(aStream);
+        scriptableInputStream.read(aLength);
+        return;
+    }
+
+    throw new Error("Unknown signature for nsIStreamListener.onDataAvailable()");
   },
   
   onStopRequest: function (aRequest, aContext, aStatus) {

From 757d97ebf9d37810d5fbb6b3034ffeaa81ed0353 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 19:12:14 +0100
Subject: [PATCH 11/25] tb68/changes#nsiscriptableunicodeconverter

---
 xul-ext/modules/utils.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/xul-ext/modules/utils.js b/xul-ext/modules/utils.js
index 8e46b0c..4b95fb6 100644
--- a/xul-ext/modules/utils.js
+++ b/xul-ext/modules/utils.js
@@ -593,17 +593,7 @@ Utils.prototype = {
     //TODO:2: Maybe shouldn't use byteArray output at all - seems a bit buggy RE different encodings and maybe negative ints
     hash: function(data, outFormat, algorithm)
     {
-        var converterUTF8 =
-            Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].
-            createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
- 
-        converterUTF8.charset = "UTF-8";
-
-        var converterUTF16 =
-            Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].
-            createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
- 
-        converterUTF16.charset = "UTF-16";
+        let encoderUtf8 = new TextEncoder('utf-8');
 
         // result is an out parameter,
         // result.value will contain the array length
@@ -612,7 +602,7 @@ Utils.prototype = {
         if (typeof data === "string")
         {
             // data is now an array of bytes
-            data = converterUTF8.convertToByteArray(data, result);
+            data = encoderUtf8.encode(data);
         }
         var ch = Components.classes["@mozilla.org/security/hash;1"]
                            .createInstance(Components.interfaces.nsICryptoHash);
@@ -629,9 +619,11 @@ Utils.prototype = {
  
         if (outFormat === "binary")
             return hash;
-        else if (outFormat === "byteArray")
-            return converterUTF16.convertToByteArray(hash, result);
-
+        else if (outFormat === "byteArray") {
+            let encoderUtf16 = new TextEncoder('utf-16');
+            return encoderUtf16.encode(hash);
+            
+        }
         // convert the binary hash data to a hex string.
         var s = Array.from(hash, (c, i) => utils.toHexString(hash.charCodeAt(i))).join("");
 

From 5ed75b027b292f3f90a35886e825cc92e9ca22c8 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 19:18:56 +0100
Subject: [PATCH 12/25] 
 tb68/changes#nsidomelement-nsidomnode-and-other-basic-dom-interfaces

---
 xul-ext/chrome/content/framescript/formsFillTab.js | 4 ++--
 xul-ext/chrome/content/framescript/formsTab.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xul-ext/chrome/content/framescript/formsFillTab.js b/xul-ext/chrome/content/framescript/formsFillTab.js
index 6ae857c..773e250 100644
--- a/xul-ext/chrome/content/framescript/formsFillTab.js
+++ b/xul-ext/chrome/content/framescript/formsFillTab.js
@@ -124,9 +124,9 @@ var _fillMatchedFields = function (fields, dataFields, formFields)
         let DOMelement;
 
         if (formFields[ffi].type == "select-one")
-            DOMelement = formFields[ffi].DOMSelectElement;
+            DOMelement = formFields[ffi].SelectElement;
         else
-            DOMelement = formFields[ffi].DOMInputElement;
+            DOMelement = formFields[ffi].InputElement;
 
         Logger.info("We will populate field " + ffi + " (id:" + formFields[ffi].fieldId + ")", " with: " + dataFields[dfi].value);
 
diff --git a/xul-ext/chrome/content/framescript/formsTab.js b/xul-ext/chrome/content/framescript/formsTab.js
index 47282e9..fd0fa97 100644
--- a/xul-ext/chrome/content/framescript/formsTab.js
+++ b/xul-ext/chrome/content/framescript/formsTab.js
@@ -142,9 +142,9 @@ var _getFormFields = function (form, isSubmission, currentPage)
         allFields[allFields.length-1].element.init(
             form.elements[i].name, fieldValue, form.elements[i].id, DOMtype, currentPage);
         if (DOMtype == "select-one")
-            allFields[allFields.length-1].element.DOMSelectElement = form.elements[i];
+            allFields[allFields.length-1].element.SelectElement = form.elements[i];
         else
-            allFields[allFields.length-1].element.DOMInputElement = form.elements[i];
+            allFields[allFields.length-1].element.InputElement = form.elements[i];
             
         if (DOMtype == "password" && firstPasswordIndex == -1)
             firstPasswordIndex = allFields.length-1;

From a0c2a9b1d1e8cd0f24a1a7775f345ffc202b41cb Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 20 Mar 2021 19:23:46 +0100
Subject: [PATCH 13/25] tb68/changes#services-io-newchannelfromuri-2

---
 xul-ext/modules/session.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xul-ext/modules/session.js b/xul-ext/modules/session.js
index d17d755..73d9381 100644
--- a/xul-ext/modules/session.js
+++ b/xul-ext/modules/session.js
@@ -270,7 +270,7 @@ function session()
                     var uri = ioService.newURI(rpc.httpChannelURI, null, null);
 
                     // get a channel for that nsIURI
-                    rpc.httpChannel = ioService.newChannelFromURI(
+                    rpc.httpChannel = Services.io.newChannelFromURI(
                         uri,
                         null, // loadingNode
                         Services.scriptSecurityManager.getSystemPrincipal(), // loadingPrincipal

From b05d7b74b6e35ecadd3fb72448a9e363ddfce43f Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 21:21:30 +0100
Subject: [PATCH 14/25] WindowListener-API

---
 xul-ext/api/windowListener/implementation.js | 1074 ++++++++++++++++++
 xul-ext/api/windowListener/schema.json       |  134 +++
 xul-ext/background.js                        |   46 +
 xul-ext/chrome.manifest                      |    2 +-
 xul-ext/manifest.json                        |   55 +-
 5 files changed, 1285 insertions(+), 26 deletions(-)
 create mode 100644 xul-ext/api/windowListener/implementation.js
 create mode 100644 xul-ext/api/windowListener/schema.json
 create mode 100644 xul-ext/background.js

diff --git a/xul-ext/api/windowListener/implementation.js b/xul-ext/api/windowListener/implementation.js
new file mode 100644
index 0000000..7baa45c
--- /dev/null
+++ b/xul-ext/api/windowListener/implementation.js
@@ -0,0 +1,1074 @@
+/*
+ * This file is provided by the addon-developer-support repository at
+ * https://github.com/thundernest/addon-developer-support
+ *
+ * Version: 1.44
+ * - Add notifyExperiment() function to send data to privileged scripts inside
+ *   an Experiment. The privileged script must include notifyTools.js from the
+ *   addon-developer-support repository.
+ *
+ *   // In a WebExtension background script:
+ *   // Note: Restrictions of the structured clone algorythm apply to the send data.
+ *   messenger.WindowListener.notifyExperiment({data: "voilá"});
+ *
+ *   // In a privileged script inside an Experiment:
+ *   let Listerner1 = notifyTools.registerListener((rv) => console.log("listener #1", rv));
+ *   let Listerner2 = notifyTools.registerListener((rv) => console.log("listener #2", rv));
+ *   let Listerner3 = notifyTools.registerListener((rv) => console.log("listener #3", rv));
+ *   notifyTools.removeListener(Listerner2);
+ *
+ * - Add onNotifyBackground event, which can be registered in the background page,
+ *   to receive data from privileged scripts inside an Experiment. The privileged
+ *   script must include notifyTools.js from the addon-developer-support repository.
+  *
+ *   // In a WebExtension background script:
+ *   messenger.WindowListener.onNotifyBackground.addListener(async (info) => {
+ *    switch (info.command) {
+ *     case "doSomething":
+ *      let rv = await doSomething(info.data);
+ *      return {
+ *       result: rv, 
+ *       data: [1,2,3]
+ *      };
+ *      break;
+ *    }
+ *   });
+ *
+ *   // In a privileged script inside an Experiment:
+ *   let rv = await notifyTools.notifyBackground({command: "doSomething", data: [1,2,3]});
+ *   // rv will be whatever has been returned by the background script.
+ *   // Note: Restrictions of the structured clone algorythm apply to
+ *   // the send and recieved data.
+ *
+ * Version: 1.39
+ * - fix for 68
+ *
+ * Version: 1.36
+ * - fix for beta 87
+ *
+ * Version: 1.35
+ * - add support for options button/menu in add-on manager and fix 68 double menu entry
+ *
+ * Version: 1.34
+ * - fix error in unload
+ *
+ * Version: 1.33
+ * - fix for e10s
+ *
+ * Version: 1.30
+ * - replace setCharPref by setStringPref to cope with URTF-8 encoding
+ *
+ * Version: 1.29
+ * - open options window centered
+ *
+ * Version: 1.28
+ * - do not crash on missing icon
+ *
+ * Version: 1.27
+ * - add openOptionsDialog()
+ *
+ * Version: 1.26
+ * - pass WL object to legacy preference window
+ *
+ * Version: 1.25
+ * - adding waitForMasterPassword
+ *
+ * Version: 1.24
+ * - automatically localize i18n locale strings in injectElements()
+ *
+ * Version: 1.22
+ * - to reduce confusions, only check built-in URLs as add-on URLs cannot
+ *   be resolved if a temp installed add-on has bin zipped
+ *
+ * Version: 1.21
+ * - print debug messages only if add-ons are installed temporarily from
+ *   the add-on debug page
+ * - add checks to registered windows and scripts, if they actually exists
+ *
+ * Version: 1.20
+ * - fix long delay before customize window opens
+ * - fix non working removal of palette items
+ *
+ * Version: 1.19
+ * - add support for ToolbarPalette
+ *
+ * Version: 1.18
+ * - execute shutdown script also during global app shutdown (fixed)
+ *
+ * Version: 1.17
+ * - execute shutdown script also during global app shutdown
+ *
+ * Version: 1.16
+ * - support for persist
+ *
+ * Version: 1.15
+ * - make (undocumented) startup() async
+ *
+ * Version: 1.14
+ * - support resource urls
+ *
+ * Version: 1.12
+ * - no longer allow to enforce custom "namespace"
+ * - no longer call it namespace but uniqueRandomID / scopeName
+ * - expose special objects as the global WL object
+ * - autoremove injected elements after onUnload has ben executed
+ *
+ * Version: 1.9
+ * - automatically remove all entries added by injectElements
+ *
+ * Version: 1.8
+ * - add injectElements
+ *
+ * Version: 1.7
+ * - add injectCSS
+ * - add optional enforced namespace
+ *
+ * Version: 1.6
+ * - added mutation observer to be able to inject into browser elements
+ * - use larger icons as fallback
+ *
+ * Author: John Bieling (john@thunderbird.net)
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+
+// Import some things we need.
+var { ExtensionCommon } = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
+var { ExtensionSupport } = ChromeUtils.import("resource:///modules/ExtensionSupport.jsm");
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+var WindowListener = class extends ExtensionCommon.ExtensionAPI {
+  log(msg) {
+    if (this.debug) console.log("WindowListener API: " + msg);
+  }
+
+  getThunderbirdMajorVersion() {
+    return parseInt(Services.appinfo.version.split(".").shift());
+  }
+
+  getCards(e) {
+    // This gets triggered by real events but also manually by providing the outer window.
+    // The event is attached to the outer browser, get the inner one.
+    let doc;
+
+    // 78,86, and 87+ need special handholding. *Yeah*.
+    if (this.getThunderbirdMajorVersion() < 86) {
+      let ownerDoc = e.document || e.target.ownerDocument;
+      doc = ownerDoc.getElementById("html-view-browser").contentDocument;
+    } else if (this.getThunderbirdMajorVersion() < 87) {
+      let ownerDoc = e.document || e.target;
+      doc = ownerDoc.getElementById("html-view-browser").contentDocument;
+    } else {
+      doc = e.document || e.target;
+    }
+    return doc.querySelectorAll("addon-card");
+  }
+
+  // Add pref entry to 68
+  add68PrefsEntry(event) {
+    let id = this.menu_addonPrefs_id + "_" + this.uniqueRandomID;
+
+    // Get the best size of the icon (16px or bigger)
+    let iconSizes = this.extension.manifest.icons
+      ? Object.keys(this.extension.manifest.icons)
+      : [];
+    iconSizes.sort((a,b)=>a-b);
+    let bestSize = iconSizes.filter(e => parseInt(e) >= 16).shift();
+    let icon = bestSize ? this.extension.manifest.icons[bestSize] : "";
+
+    let name = this.extension.manifest.name;
+    let entry = icon
+      ? event.target.ownerGlobal.MozXULElement.parseXULToFragment(
+          `<menuitem class="menuitem-iconic" id="${id}" image="${icon}" label="${name}" />`)
+      :  event.target.ownerGlobal.MozXULElement.parseXULToFragment(
+          `<menuitem id="${id}" label="${name}" />`);
+
+    event.target.appendChild(entry);
+    let noPrefsElem = event.target.querySelector('[disabled="true"]');
+    // using collapse could be undone by core, so we use display none
+    // noPrefsElem.setAttribute("collapsed", "true");
+    noPrefsElem.style.display = "none";
+    event.target.ownerGlobal.document.getElementById(id).addEventListener("command", this);
+  }
+
+  // Event handler for the addon manager, to update the state of the options button.
+  handleEvent(e) {
+    switch (e.type) {
+      // 68 add-on options menu showing
+      case "popupshowing": {
+        this.add68PrefsEntry(e);
+      }
+      break;
+
+      // 78/88 add-on options menu/button click
+      case "click": {
+        e.preventDefault();
+        e.stopPropagation();
+        let WL = {}
+        WL.extension = this.extension;
+        WL.messenger = this.getMessenger(this.context);
+        let w = Services.wm.getMostRecentWindow("mail:3pane");
+        w.openDialog(this.pathToOptionsPage, "AddonOptions", "chrome,resizable,centerscreen", WL);
+      }
+      break;
+
+      // 68 add-on options menu command
+      case "command": {
+        let WL = {}
+        WL.extension = this.extension;
+        WL.messenger = this.getMessenger(this.context);
+        e.target.ownerGlobal.openDialog(this.pathToOptionsPage, "AddonOptions", "chrome,resizable,centerscreen", WL);
+      }
+      break;
+
+      // update, ViewChanged and manual call for add-on manager options overlay
+      default: {
+        let cards = this.getCards(e);
+        for (let card of cards) {
+          // Setup either the options entry in the menu or the button
+          //window.document.getElementById(id).addEventListener("command", function() {window.openDialog(self.pathToOptionsPage, "AddonOptions", "chrome,resizable,centerscreen", WL)});
+          if (card.addon.id == this.extension.id) {
+            if (this.getThunderbirdMajorVersion() < 88) {
+              // Options menu in 78-87
+              let addonOptionsLegacyEntry = card.querySelector(".extension-options-legacy");
+              if (card.addon.isActive && !addonOptionsLegacyEntry) {
+                let addonOptionsEntry = card.querySelector("addon-options panel-list panel-item[action='preferences']");
+                addonOptionsLegacyEntry = card.ownerDocument.createElement("panel-item");
+                addonOptionsLegacyEntry.setAttribute("data-l10n-id", "preferences-addon-button");
+                addonOptionsLegacyEntry.classList.add("extension-options-legacy");
+                addonOptionsEntry.parentNode.insertBefore(
+                  addonOptionsLegacyEntry,
+                  addonOptionsEntry
+                );
+                card.querySelector(".extension-options-legacy").addEventListener("click", this);
+              } else if (!card.addon.isActive && addonOptionsLegacyEntry) {
+                addonOptionsLegacyEntry.remove();
+              }
+            } else {
+              // Add-on button in 88
+              let addonOptionsButton = card.querySelector(".extension-options-button2");
+              if (card.addon.isActive && !addonOptionsButton) {
+                addonOptionsButton = card.ownerDocument.createElement("button");
+                addonOptionsButton.classList.add("extension-options-button2");
+                addonOptionsButton.style["min-width"] = "auto";
+                addonOptionsButton.style["min-height"] = "auto";
+                addonOptionsButton.style["width"] = "24px";
+                addonOptionsButton.style["height"] = "24px";
+                addonOptionsButton.style["margin"] = "0";
+                addonOptionsButton.style["margin-inline-start"] = "8px";
+                addonOptionsButton.style["-moz-context-properties"] = "fill";
+                addonOptionsButton.style["fill"] = "currentColor";
+                addonOptionsButton.style["background-image"] = "url('chrome://messenger/skin/icons/developer.svg')";
+                addonOptionsButton.style["background-repeat"] = "no-repeat";
+                addonOptionsButton.style["background-position"] = "center center";
+                addonOptionsButton.style["padding"] = "1px";
+                addonOptionsButton.style["display"] = "flex";
+                addonOptionsButton.style["justify-content"] = "flex-end";
+                card.optionsButton.parentNode.insertBefore(
+                  addonOptionsButton,
+                  card.optionsButton
+                );
+                card.querySelector(".extension-options-button2").addEventListener("click", this);
+              } else if (!card.addon.isActive && addonOptionsButton) {
+                addonOptionsButton.remove();
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+// Some tab/add-on-manager related functions
+  getTabMail(window) {
+    return window.document.getElementById("tabmail");
+  }
+
+  // returns the outer browser, not the nested browser of the add-on manager
+  // events must be attached to the outer browser
+  getAddonManagerFromTab(tab) {
+    let win = tab.browser.contentWindow;
+    if (win && win.location.href == "about:addons") {
+      return win;
+    }
+  }
+
+  getAddonManagerFromWindow(window) {
+    let tabMail = this.getTabMail(window);
+    for (let tab of tabMail.tabInfo) {
+      let win = this.getAddonManagerFromTab(tab)
+      if (win) {
+        return win;
+      }
+    }
+  }
+
+  setupAddonManager(managerWindow, paint = true) {
+    if (!managerWindow) {
+      return;
+    }
+    if (managerWindow
+          && managerWindow[this.uniqueRandomID]
+          && managerWindow[this.uniqueRandomID].hasAddonManagerEventListeners
+    ) {
+      return;
+    }
+    managerWindow.document.addEventListener("ViewChanged", this);
+    managerWindow.document.addEventListener("update", this);
+    managerWindow[this.uniqueRandomID] = {};
+    managerWindow[this.uniqueRandomID].hasAddonManagerEventListeners = true;
+    if (paint) {
+      this.handleEvent(managerWindow);
+    }
+  }
+
+
+  getMessenger(context) {
+    let apis = [
+      "storage",
+      "runtime",
+      "extension",
+      "i18n",
+    ];
+
+    function getStorage() {
+      let localstorage = null;
+      try {
+        localstorage = context.apiCan.findAPIPath("storage");
+        localstorage.local.get = (...args) =>
+          localstorage.local.callMethodInParentProcess("get", args);
+        localstorage.local.set = (...args) =>
+          localstorage.local.callMethodInParentProcess("set", args);
+        localstorage.local.remove = (...args) =>
+          localstorage.local.callMethodInParentProcess("remove", args);
+        localstorage.local.clear = (...args) =>
+          localstorage.local.callMethodInParentProcess("clear", args);
+      } catch (e) {
+        console.info("Storage permission is missing");
+      }
+      return localstorage;
+    }
+
+    let messenger = {};
+    for (let api of apis) {
+      switch (api) {
+        case "storage":
+          XPCOMUtils.defineLazyGetter(messenger, "storage", () =>
+            getStorage()
+          );
+        break;
+
+        default:
+          XPCOMUtils.defineLazyGetter(messenger, api, () =>
+            context.apiCan.findAPIPath(api)
+          );
+      }
+    }
+    return messenger;
+  }
+
+  error(msg) {
+    if (this.debug) console.error("WindowListener API: " + msg);
+  }
+
+  // async sleep function using Promise
+  async sleep(delay) {
+    let timer =  Components.classes["@mozilla.org/timer;1"].createInstance(Components.interfaces.nsITimer);
+    return new Promise(function(resolve, reject) {
+      let event = {
+        notify: function(timer) {
+          resolve();
+        }
+      }
+      timer.initWithCallback(event, delay, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
+    });
+  }
+
+  getAPI(context) {
+    // track if this is the background/main context
+    this.isBackgroundContext = (context.viewType == "background");
+    this.context = context;
+
+    this.uniqueRandomID = "AddOnNS" + context.extension.instanceId;
+    this.menu_addonPrefs_id = "addonPrefs";
+
+    this.registeredWindows = {};
+    this.pathToStartupScript = null;
+    this.pathToShutdownScript = null;
+    this.pathToOptionsPage = null;
+    this.chromeHandle = null;
+    this.chromeData = null;
+    this.resourceData = null;
+    this.openWindows = [];
+    this.debug = context.extension.addonData.temporarilyInstalled;
+
+    const aomStartup = Cc["@mozilla.org/addons/addon-manager-startup;1"].getService(Ci.amIAddonManagerStartup);
+    const resProto = Cc["@mozilla.org/network/protocol;1?name=resource"].getService(Ci.nsISubstitutingProtocolHandler);
+
+    let self = this;
+
+    // TabMonitor to detect opening of tabs, to setup the options button in the add-on manager.
+    this.tabMonitor = {
+      onTabTitleChanged(aTab) {},
+      onTabClosing(aTab) {},
+      onTabPersist(aTab) {},
+      onTabRestored(aTab) {},
+      onTabSwitched(aNewTab, aOldTab) {},
+      async onTabOpened(aTab) {
+        if (!aTab.pageLoaded) {
+          // await a location change if browser is not loaded yet
+          await new Promise(resolve => {
+            let reporterListener = {
+              QueryInterface: ChromeUtils.generateQI([
+                "nsIWebProgressListener",
+                "nsISupportsWeakReference",
+              ]),
+              onStateChange() {},
+              onProgressChange() {},
+              onLocationChange(
+                  /* in nsIWebProgress*/ aWebProgress,
+                  /* in nsIRequest*/ aRequest,
+                  /* in nsIURI*/ aLocation
+              ) {
+                aTab.browser.removeProgressListener(reporterListener);
+                resolve();
+              },
+              onStatusChange() {},
+              onSecurityChange() {},
+              onContentBlockingEvent() {}
+            }
+            aTab.browser.addProgressListener(reporterListener);
+          });
+        }
+        // Setup the ViewChange event listener in the outer browser of the add-on,
+        // but do not actually add the button/menu, as the inner browser is not yet ready,
+        // let the ViewChange event do it
+        self.setupAddonManager(self.getAddonManagerFromTab(aTab), false);
+      },
+    };
+
+    this.onNotifyBackgroundObserver = {
+      observe: async function (aSubject, aTopic, aData) {
+        if (self.observerTracker && aData == self.extension.id) {
+          let payload = aSubject.wrappedJSObject;
+          // This is called from the WL observer.js and therefore it should have a resolve
+          // payload, but better check.
+          if (payload.resolve) {
+            let rv = await self.observerTracker(payload.data);
+            payload.resolve(rv);
+          } else {
+            self.observerTracker(payload.data);
+          }
+        }
+      }
+    }    
+    return {
+      WindowListener: {
+
+        notifyExperiment(data) {
+          Services.obs.notifyObservers(
+            // Stuff data in an array so simple strings can be used as payload
+            // without the observerService complaining.
+            [data],
+            "WindowListenerNotifyExperimentObserver",
+            self.extension.id
+          );
+        },
+        
+        onNotifyBackground: new ExtensionCommon.EventManager({
+          context,
+          name: "WindowListener.onNotifyBackground",
+          register: fire => {            
+            Services.obs.addObserver(self.onNotifyBackgroundObserver, "WindowListenerNotifyBackgroundObserver", false);
+            self.observerTracker = fire.sync;
+            return () => {
+              Services.obs.removeObserver(self.onNotifyBackgroundObserver, "WindowListenerNotifyBackgroundObserver", false);
+              self.observerTracker = null;
+            };
+          },
+        }).api(),
+
+        async waitForMasterPassword() {
+          // Wait until master password has been entered (if needed)
+          while (!Services.logins.isLoggedIn) {
+            self.log("Waiting for master password.");
+            await self.sleep(1000);
+          }
+          self.log("Master password has been entered.");
+        },
+
+        aDocumentExistsAt(uriString) {
+          self.log("Checking if document at <" + uriString + "> used in registration actually exists.");
+          try {
+            let uriObject = Services.io.newURI(uriString);
+            let content = Cu.readUTF8URI(uriObject);
+          } catch (e) {
+            Components.utils.reportError(e);
+            return false;
+          }
+          return true;
+        },
+
+        registerOptionsPage(optionsUrl) {
+          self.pathToOptionsPage = optionsUrl.startsWith("chrome://")
+            ? optionsUrl
+            : context.extension.rootURI.resolve(optionsUrl);
+        },
+
+        registerDefaultPrefs(defaultUrl) {
+          let url = context.extension.rootURI.resolve(defaultUrl);
+
+          let prefsObj = {};
+          prefsObj.Services = ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
+          prefsObj.pref = function(aName, aDefault) {
+            let defaults = Services.prefs.getDefaultBranch("");
+            switch (typeof aDefault) {
+              case "string":
+                  return defaults.setStringPref(aName, aDefault);
+
+              case "number":
+                  return defaults.setIntPref(aName, aDefault);
+
+              case "boolean":
+                  return defaults.setBoolPref(aName, aDefault);
+
+              default:
+                throw new Error("Preference <" + aName + "> has an unsupported type <" + typeof aDefault + ">. Allowed are string, number and boolean.");
+            }
+          }
+          Services.scriptloader.loadSubScript(url, prefsObj, "UTF-8");
+        },
+
+        registerChromeUrl(data) {
+          if (!self.isBackgroundContext)
+            throw new Error("The WindowListener API may only be called from the background page.");
+
+          let chromeData = [];
+          let resourceData = [];
+          for (let entry of data) {
+            if (entry[0] == "resource") resourceData.push(entry);
+            else chromeData.push(entry)
+          }
+
+          if (chromeData.length > 0) {
+            const manifestURI = Services.io.newURI(
+              "manifest.json",
+              null,
+              context.extension.rootURI
+            );
+            self.chromeHandle = aomStartup.registerChrome(manifestURI, chromeData);
+          }
+
+          for (let res of resourceData) {
+            // [ "resource", "shortname" , "path" ]
+            let uri = Services.io.newURI(
+              res[2],
+              null,
+              context.extension.rootURI
+            );
+            resProto.setSubstitutionWithFlags(
+              res[1],
+              uri,
+              resProto.ALLOW_CONTENT_ACCESS
+            );
+          }
+
+          self.chromeData = chromeData;
+          self.resourceData = resourceData;
+        },
+
+        registerWindow(windowHref, jsFile) {
+          if (!self.isBackgroundContext)
+            throw new Error("The WindowListener API may only be called from the background page.");
+
+          if (self.debug && !this.aDocumentExistsAt(windowHref)) {
+            self.error("Attempt to register an injector script for non-existent window: " + windowHref);
+            return;
+          }
+
+          if (!self.registeredWindows.hasOwnProperty(windowHref)) {
+            // path to JS file can either be chrome:// URL or a relative URL
+            let path = jsFile.startsWith("chrome://")
+              ? jsFile
+              : context.extension.rootURI.resolve(jsFile)
+
+            self.registeredWindows[windowHref] = path;
+          } else {
+            self.error("Window <" +windowHref + "> has already been registered");
+          }
+        },
+
+        registerStartupScript(aPath) {
+          if (!self.isBackgroundContext)
+            throw new Error("The WindowListener API may only be called from the background page.");
+
+          self.pathToStartupScript = aPath.startsWith("chrome://")
+            ? aPath
+            : context.extension.rootURI.resolve(aPath);
+        },
+
+        registerShutdownScript(aPath) {
+          if (!self.isBackgroundContext)
+            throw new Error("The WindowListener API may only be called from the background page.");
+
+          self.pathToShutdownScript = aPath.startsWith("chrome://")
+            ? aPath
+            : context.extension.rootURI.resolve(aPath);
+        },
+
+        openOptionsDialog(windowId) {
+          let window = context.extension.windowManager.get(windowId, context).window
+          let WL = {}
+          WL.extension = self.extension;
+          WL.messenger = self.getMessenger(self.context);
+          window.openDialog(self.pathToOptionsPage, "AddonOptions", "chrome,resizable,centerscreen", WL);
+        },
+
+        async startListening() {
+          if (!self.isBackgroundContext)
+            throw new Error("The WindowListener API may only be called from the background page.");
+
+          // load the registered startup script, if one has been registered
+          // (mail3:pane may not have been fully loaded yet)
+          if (self.pathToStartupScript) {
+            let startupJS = {};
+            startupJS.WL = {}
+            startupJS.WL.extension = self.extension;
+            startupJS.WL.messenger = self.getMessenger(self.context);
+            try {
+              if (self.pathToStartupScript) {
+                Services.scriptloader.loadSubScript(self.pathToStartupScript, startupJS, "UTF-8");
+                // delay startup until startup has been finished
+                self.log("Waiting for async startup() in <" + self.pathToStartupScript + "> to finish.");
+                if (startupJS.startup) {
+                  await startupJS.startup();
+                  self.log("startup() in <" + self.pathToStartupScript + "> finished");
+                } else {
+                  self.log("No startup() in <" + self.pathToStartupScript + "> found.");
+                }
+              }
+            } catch (e) {
+              Components.utils.reportError(e)
+            }
+          }
+
+          let urls = Object.keys(self.registeredWindows);
+          if (urls.length > 0) {
+            // Before registering the window listener, check which windows are already open
+            self.openWindows = [];
+            for (let window of Services.wm.getEnumerator(null)) {
+              self.openWindows.push(window);
+            }
+
+            // Register window listener for all pre-registered windows
+            ExtensionSupport.registerWindowListener("injectListener_" + self.uniqueRandomID, {
+              // React on all windows and manually reduce to the registered
+              // windows, so we can do special actions when the main
+              // messenger window is opened.
+              //chromeURLs: Object.keys(self.registeredWindows),
+              async onLoadWindow(window) {
+                // Create add-on scope
+                window[self.uniqueRandomID] = {};
+
+                // Special action #1: If this is the main messenger window
+                if (window.location.href == "chrome://messenger/content/messenger.xul" ||
+                  window.location.href == "chrome://messenger/content/messenger.xhtml") {
+
+                  if (self.pathToOptionsPage) {
+                    if (self.getThunderbirdMajorVersion() < 78) {
+                      let element_addonPrefs = window.document.getElementById(self.menu_addonPrefs_id);
+                      element_addonPrefs.addEventListener("popupshowing", self);
+                    } else {
+                      // Setup the options button/menu in the add-on manager, if it is already open.
+                      self.setupAddonManager(self.getAddonManagerFromWindow(window));
+                      // Add a tabmonitor, to be able to setup the options button/menu in the add-on manager.
+                      self.getTabMail(window).registerTabMonitor(self.tabMonitor);
+                      window[self.uniqueRandomID].hasTabMonitor = true;
+                    }
+                  }
+                }
+
+                // Special action #2: If this page contains browser elements
+                let browserElements = window.document.getElementsByTagName("browser");
+                if (browserElements.length > 0) {
+                  //register a MutationObserver
+                  window[self.uniqueRandomID]._mObserver = new window.MutationObserver(function(mutations) {
+                      mutations.forEach(async function(mutation) {
+                          if (mutation.attributeName == "src" && self.registeredWindows.hasOwnProperty(mutation.target.getAttribute("src"))) {
+                            // When the MutationObserver callsback, the window is still showing "about:black" and it is going
+                            // to unload and then load the new page. Any eventListener attached to the window will be removed
+                            // so we cannot listen for the load event. We have to poll manually to learn when loading has finished.
+                            // On my system it takes 70ms.
+                            let loaded = false;
+                            for (let i=0; i < 100 && !loaded; i++) {
+                              await self.sleep(100);
+                              let targetWindow = mutation.target.contentWindow.wrappedJSObject;
+                              if (targetWindow && targetWindow.location.href == mutation.target.getAttribute("src") && targetWindow.document.readyState == "complete") {
+                                loaded = true;
+                                break;
+                              }
+                            }
+                            if (loaded) {
+                              let targetWindow = mutation.target.contentWindow.wrappedJSObject;
+                              // Create add-on scope
+                              targetWindow[self.uniqueRandomID] = {};
+                              // Inject with isAddonActivation = false
+                              self._loadIntoWindow(targetWindow, false);
+                            }
+                          }
+                      });
+                  });
+
+                 for (let element of browserElements) {
+                      if (self.registeredWindows.hasOwnProperty(element.getAttribute("src"))) {
+                        let targetWindow = element.contentWindow.wrappedJSObject;
+                        // Create add-on scope
+                        targetWindow[self.uniqueRandomID] = {};
+                        // Inject with isAddonActivation = true
+                        self._loadIntoWindow(targetWindow, true);
+                      } else {
+                        // Window/Browser is not yet fully loaded, postpone injection via MutationObserver
+                        window[self.uniqueRandomID]._mObserver.observe(element, { attributes: true, childList: false, characterData: false });
+                      }
+                  }
+                }
+
+                // Load JS into window
+                self._loadIntoWindow(window, self.openWindows.includes(window));
+              },
+
+              onUnloadWindow(window) {
+                // Remove JS from window, window is being closed, addon is not shut down
+                self._unloadFromWindow(window, false);
+              }
+            });
+          } else {
+            self.error("Failed to start listening, no windows registered");
+          }
+        },
+
+      }
+    };
+  }
+
+  _loadIntoWindow(window, isAddonActivation) {
+      if (window.hasOwnProperty(this.uniqueRandomID) && this.registeredWindows.hasOwnProperty(window.location.href)) {
+        try {
+          let uniqueRandomID = this.uniqueRandomID;
+          let extension = this.extension;
+
+          // Add reference to window to add-on scope
+          window[this.uniqueRandomID].window = window;
+          window[this.uniqueRandomID].document = window.document;
+
+          // Keep track of toolbarpalettes we are injecting into
+          window[this.uniqueRandomID]._toolbarpalettes = {};
+
+          //Create WLDATA object
+          window[this.uniqueRandomID].WL = {};
+          window[this.uniqueRandomID].WL.scopeName = this.uniqueRandomID;
+
+          // Add helper function to inject CSS to WLDATA object
+          window[this.uniqueRandomID].WL.injectCSS = function (cssFile) {
+            let element;
+            let v = parseInt(Services.appinfo.version.split(".").shift());
+
+            // using createElementNS in TB78 delays the insert process and hides any security violation errors
+            if (v > 68) {
+              element = window.document.createElement("link");
+            } else {
+              let ns = window.document.documentElement.lookupNamespaceURI("html");
+              element = window.document.createElementNS(ns, "link");
+            }
+
+            element.setAttribute("wlapi_autoinjected", uniqueRandomID);
+            element.setAttribute("rel", "stylesheet");
+            element.setAttribute("href", cssFile);
+            return window.document.documentElement.appendChild(element);
+          }
+
+          // Add helper function to inject XUL to WLDATA object
+          window[this.uniqueRandomID].WL.injectElements = function (xulString, dtdFiles = [], debug = false) {
+            let toolbarsToResolve = [];
+
+            function checkElements(stringOfIDs) {
+              let arrayOfIDs = stringOfIDs.split(",").map(e => e.trim());
+              for (let id of arrayOfIDs) {
+                let element = window.document.getElementById(id);
+                if (element) {
+                  return element;
+                }
+              }
+              return null;
+            }
+
+            function localize(entity) {
+              let msg = entity.slice("__MSG_".length,-2);
+              return extension.localeData.localizeMessage(msg)
+            }
+
+            function injectChildren(elements, container) {
+              if (debug) console.log(elements);
+
+              for (let i = 0; i < elements.length; i++) {
+                // take care of persists
+                const uri = window.document.documentURI;
+                for (const persistentNode of elements[i].querySelectorAll("[persist]")) {
+                  for (const persistentAttribute of persistentNode.getAttribute("persist").trim().split(" ")) {
+                    if (Services.xulStore.hasValue(uri, persistentNode.id, persistentAttribute)) {
+                      persistentNode.setAttribute(
+                        persistentAttribute,
+                        Services.xulStore.getValue(uri, persistentNode.id, persistentAttribute)
+                      );
+                    }
+                  }
+                }
+
+                if (elements[i].hasAttribute("insertafter") && checkElements(elements[i].getAttribute("insertafter"))) {
+                  let insertAfterElement = checkElements(elements[i].getAttribute("insertafter"));
+
+                  if (debug) console.log(elements[i].tagName + "#" + elements[i].id + ": insertafter " + insertAfterElement.id);
+                  if (debug && elements[i].id && window.document.getElementById(elements[i].id)) {
+                    console.error("The id <" + elements[i].id + "> of the injected element already exists in the document!");
+                  }
+                  elements[i].setAttribute("wlapi_autoinjected", uniqueRandomID);
+                  insertAfterElement.parentNode.insertBefore(elements[i], insertAfterElement.nextSibling);
+
+                } else if (elements[i].hasAttribute("insertbefore") && checkElements(elements[i].getAttribute("insertbefore"))) {
+                  let insertBeforeElement = checkElements(elements[i].getAttribute("insertbefore"));
+
+                  if (debug) console.log(elements[i].tagName + "#" + elements[i].id + ": insertbefore " + insertBeforeElement.id);
+                  if (debug && elements[i].id && window.document.getElementById(elements[i].id)) {
+                    console.error("The id <" + elements[i].id + "> of the injected element already exists in the document!");
+                  }
+                  elements[i].setAttribute("wlapi_autoinjected", uniqueRandomID);
+                  insertBeforeElement.parentNode.insertBefore(elements[i], insertBeforeElement);
+
+                } else if (elements[i].id && window.document.getElementById(elements[i].id)) {
+                  // existing container match, dive into recursivly
+                  if (debug) console.log(elements[i].tagName + "#" + elements[i].id + " is an existing container, injecting into " + elements[i].id);
+                  injectChildren(Array.from(elements[i].children), window.document.getElementById(elements[i].id));
+
+                } else if (elements[i].localName === "toolbarpalette") {
+                  // These vanish from the document but still exist via the palette property
+                  if (debug) console.log(elements[i].id + " is a toolbarpalette");
+                  let boxes = [...window.document.getElementsByTagName("toolbox")];
+                  let box = boxes.find(box => box.palette && box.palette.id === elements[i].id);
+                  let palette = box ? box.palette : null;
+
+                  if (!palette) {
+                    if (debug) console.log(`The palette for ${elements[i].id} could not be found, deferring to later`);
+                    continue;
+                  }
+
+                  if (debug) console.log(`The toolbox for ${elements[i].id} is ${box.id}`);
+
+                  toolbarsToResolve.push(...box.querySelectorAll("toolbar"));
+                  toolbarsToResolve.push(...window.document.querySelectorAll(`toolbar[toolboxid="${box.id}"]`));
+                  for (let child of elements[i].children) {
+                    child.setAttribute("wlapi_autoinjected", uniqueRandomID);
+                  }
+                  window[uniqueRandomID]._toolbarpalettes[palette.id] = palette;
+                  injectChildren(Array.from(elements[i].children), palette);
+                } else {
+                  // append element to the current container
+                  if (debug) console.log(elements[i].tagName + "#" + elements[i].id + ": append to " + container.id);
+                  elements[i].setAttribute("wlapi_autoinjected", uniqueRandomID);
+                  container.appendChild(elements[i]);
+                }
+              }
+            }
+
+            if (debug) console.log ("Injecting into root document:");
+            let localizedXulString = xulString.replace(/__MSG_(.*?)__/g, localize);
+            injectChildren(Array.from(window.MozXULElement.parseXULToFragment(localizedXulString, dtdFiles).children), window.document.documentElement);
+
+            for (let bar of toolbarsToResolve) {
+              let currentset = Services.xulStore.getValue(
+                window.location,
+                bar.id,
+                "currentset"
+              );
+              if (currentset) {
+                bar.currentSet = currentset;
+              } else if (bar.getAttribute("defaultset")) {
+                bar.currentSet = bar.getAttribute("defaultset");
+              }
+            }
+          }
+
+          // Add extension object to WLDATA object
+          window[this.uniqueRandomID].WL.extension = this.extension;
+          // Add messenger object to WLDATA object
+          window[this.uniqueRandomID].WL.messenger = this.getMessenger(this.context);
+          // Load script into add-on scope
+          Services.scriptloader.loadSubScript(this.registeredWindows[window.location.href], window[this.uniqueRandomID], "UTF-8");
+          window[this.uniqueRandomID].onLoad(isAddonActivation);
+        } catch (e) {
+          Components.utils.reportError(e)
+        }
+      }
+  }
+
+  _unloadFromWindow(window, isAddonDeactivation) {
+    // unload any contained browser elements
+      if (window.hasOwnProperty(this.uniqueRandomID) && window[this.uniqueRandomID].hasOwnProperty("_mObserver")) {
+        window[this.uniqueRandomID]._mObserver.disconnect();
+        let browserElements = window.document.getElementsByTagName("browser");
+        for (let element of browserElements) {
+          if (element.contentWindow) {
+          this._unloadFromWindow(element.contentWindow.wrappedJSObject, isAddonDeactivation);
+        }
+      }
+      }
+
+      if (window.hasOwnProperty(this.uniqueRandomID) && this.registeredWindows.hasOwnProperty(window.location.href)) {
+        //  Remove this window from the list of open windows
+        this.openWindows = this.openWindows.filter(e => (e != window));
+
+        if (window[this.uniqueRandomID].onUnload) {
+          try {
+            // Call onUnload()
+            window[this.uniqueRandomID].onUnload(isAddonDeactivation);
+          } catch (e) {
+            Components.utils.reportError(e)
+          }
+        }
+
+        // Remove all auto injected objects
+        let elements = Array.from(window.document.querySelectorAll('[wlapi_autoinjected="' + this.uniqueRandomID + '"]'));
+        for (let element of elements) {
+          element.remove();
+        }
+
+        // Remove all autoinjected toolbarpalette items
+        for (const palette of Object.values(window[this.uniqueRandomID]._toolbarpalettes)) {
+          let elements = Array.from(palette.querySelectorAll('[wlapi_autoinjected="' + this.uniqueRandomID + '"]'));
+          for (let element of elements) {
+            element.remove();
+          }
+        }
+
+      }
+
+      // Remove add-on scope, if it exists
+      if (window.hasOwnProperty(this.uniqueRandomID)) {
+        delete window[this.uniqueRandomID];
+      }
+  }
+
+  onShutdown(isAppShutdown) {
+    // Unload from all still open windows
+    let urls = Object.keys(this.registeredWindows);
+    if (urls.length > 0) {
+      for (let window of Services.wm.getEnumerator(null)) {
+
+        //remove our entry in the add-on options menu
+        if (this.pathToOptionsPage && (
+              window.location.href == "chrome://messenger/content/messenger.xul" ||
+              window.location.href == "chrome://messenger/content/messenger.xhtml")
+        ) {
+          if (this.getThunderbirdMajorVersion() < 78) {
+            let element_addonPrefs = window.document.getElementById(this.menu_addonPrefs_id);
+            element_addonPrefs.removeEventListener("popupshowing", this);
+            // Remove our entry.
+            let entry = window.document.getElementById(this.menu_addonPrefs_id + "_" + this.uniqueRandomID);
+            if (entry) entry.remove();
+            // Do we have to unhide the noPrefsElement?
+            if (element_addonPrefs.children.length == 1) {
+                let noPrefsElem = element_addonPrefs.querySelector('[disabled="true"]');
+                noPrefsElem.style.display = "inline";
+            }
+          } else {
+            // Remove event listener for addon manager view changes
+            let managerWindow = this.getAddonManagerFromWindow(window);
+            if (managerWindow && managerWindow[this.uniqueRandomID] && managerWindow[this.uniqueRandomID].hasAddonManagerEventListeners) {
+              managerWindow.document.removeEventListener("ViewChanged", this);
+              managerWindow.document.removeEventListener("update", this);
+
+              let cards = this.getCards(managerWindow);
+              if (this.getThunderbirdMajorVersion() < 88) {
+                // Remove options menu in 78-87
+                for (let card of cards) {
+                  let addonOptionsLegacyEntry = card.querySelector(".extension-options-legacy");
+                  if (addonOptionsLegacyEntry) addonOptionsLegacyEntry.remove();
+                }
+              } else {
+                // Remove options button in 88
+                for (let card of cards) {
+                  if (card.addon.id == this.extension.id) {
+                    let addonOptionsButton = card.querySelector(".extension-options-button2");
+                    if (addonOptionsButton) addonOptionsButton.remove();
+                    break;
+                  }
+                }
+              }
+            }
+
+            // Remove tabmonitor
+            if (window[this.uniqueRandomID].hasTabMonitor) {
+              this.getTabMail(window).unregisterTabMonitor(this.tabMonitor);
+              window[this.uniqueRandomID].hasTabMonitor = false;
+            }
+          }
+        }
+
+        // if it is app shutdown, it is not just an add-on deactivation
+        this._unloadFromWindow(window, !isAppShutdown);
+      }
+      // Stop listening for new windows.
+      ExtensionSupport.unregisterWindowListener("injectListener_" + this.uniqueRandomID);
+    }
+
+    // Load registered shutdown script
+    let shutdownJS = {};
+    shutdownJS.extension = this.extension;
+    try {
+      if (this.pathToShutdownScript) Services.scriptloader.loadSubScript(this.pathToShutdownScript, shutdownJS, "UTF-8");
+    } catch (e) {
+      Components.utils.reportError(e)
+    }
+
+    // Extract all registered chrome content urls
+    let chromeUrls = [];
+    if (this.chromeData) {
+        for (let chromeEntry of this.chromeData) {
+        if (chromeEntry[0].toLowerCase().trim() == "content") {
+          chromeUrls.push("chrome://" + chromeEntry[1] + "/");
+        }
+      }
+    }
+
+    // Unload JSMs of this add-on
+    const rootURI = this.extension.rootURI.spec;
+    for (let module of Cu.loadedModules) {
+      if (module.startsWith(rootURI) || (module.startsWith("chrome://") && chromeUrls.find(s => module.startsWith(s)))) {
+        this.log("Unloading: " + module);
+        Cu.unload(module);
+      }
+    }
+
+    // Flush all caches
+    Services.obs.notifyObservers(null, "startupcache-invalidate");
+    this.registeredWindows = {};
+
+    if (this.resourceData) {
+      const resProto = Cc["@mozilla.org/network/protocol;1?name=resource"].getService(Ci.nsISubstitutingProtocolHandler);
+      for (let res of this.resourceData) {
+        // [ "resource", "shortname" , "path" ]
+        resProto.setSubstitution(
+          res[1],
+          null,
+        );
+      }
+    }
+
+    if (this.chromeHandle) {
+      this.chromeHandle.destruct();
+      this.chromeHandle = null;
+    }
+  }
+};
diff --git a/xul-ext/api/windowListener/schema.json b/xul-ext/api/windowListener/schema.json
new file mode 100644
index 0000000..6147b6e
--- /dev/null
+++ b/xul-ext/api/windowListener/schema.json
@@ -0,0 +1,134 @@
+[
+  {
+    "namespace": "WindowListener",
+    "events": [
+      {
+        "name": "onNotifyBackground",
+        "type": "function",
+        "description": "Fired when a new notification from notifyTools.js in an Experiment has been received.",
+        "parameters": [
+          {
+            "name": "data",
+            "type": "any",
+            "description": "Restrictions of the structured clone algorythm apply."
+          }
+        ]
+      }
+    ],
+    "functions": [
+      {
+        "name": "notifyExperiment",
+        "type": "function",
+        "description": "Notifies notifyTools.js in an Experiment and sends data.",
+        "parameters": [
+          {
+            "name": "data",
+            "type": "any",
+            "description": "Restrictions of the structured clone algorythm apply."
+          }
+        ]
+      },
+      {
+        "name": "registerDefaultPrefs",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "aPath",
+            "type": "string",
+            "description": "Relative path to the default file."
+          }
+        ]
+      },
+      {
+        "name": "registerOptionsPage",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "aPath",
+            "type": "string",
+            "description": "Path to the options page, which should be made accessible in the (legacy) Add-On Options menu."
+          }
+        ]
+      },
+      {
+        "name": "registerChromeUrl",
+        "type": "function",
+        "description": "Register folders which should be available as chrome:// urls (as defined in the legacy chrome.manifest)",
+        "parameters": [
+          {
+            "name": "data",
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "description": "Array of manifest url definitions (content, locale, resource)"
+          }
+        ]
+      },
+      {
+        "name": "waitForMasterPassword",
+        "type": "function",
+        "async": true,
+        "parameters": []
+      },
+      {
+        "name": "openOptionsDialog",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "windowId",
+            "type": "integer",
+            "description": "Id of the window the dialog should be opened from."
+          }
+        ]
+      },
+      {
+        "name": "startListening",
+        "type": "function",
+        "async": true,
+        "parameters": []
+      },
+      {
+        "name": "registerWindow",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "windowHref",
+            "type": "string",
+            "description": "Url of the window, which should be listen for."
+          },
+          {
+            "name": "jsFile",
+            "type": "string",
+            "description": "Path to the JavaScript file, which should be loaded into the window."
+          }
+        ]
+      },
+      {
+        "name": "registerStartupScript",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "aPath",
+            "type": "string",
+            "description": "Path to a JavaScript file, which should be executed on add-on startup. The script will be executed after the main application window has been sucessfully loaded."
+          }
+        ]
+      },
+      {
+        "name": "registerShutdownScript",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "aPath",
+            "type": "string",
+            "description": "Path to a JavaScript file, which should be executed on add-on shutdown."
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/xul-ext/background.js b/xul-ext/background.js
new file mode 100644
index 0000000..7918227
--- /dev/null
+++ b/xul-ext/background.js
@@ -0,0 +1,46 @@
+/**
+ * commented out locales are not complete enough on Transifex
+ */
+const locales = [
+    'cs', 
+    //'da', 
+    'de', 
+    //'el', 
+    'en-US', 
+    'es-AR', 
+    'fi', 
+    'fr', 
+    //'hi',
+    'hu',
+    //'it', 
+    //'ja', 
+    //'ko-KR', 
+    'nl', 
+    //'pl', 
+    //'pt-BR', 
+    //'pt-PT', 
+    //'ro', 
+    'ru', 
+    'sl', 
+    //'sv-SE', 
+    'tr', 
+    'ul', 
+    'zh-CN'
+];
+(async () => {
+    // https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisterdefaultprefs
+    messenger.WindowListener.registerDefaultPrefs("defaults/preferences/prefs.js")
+    /**
+     * https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisterchromeurl
+     * Register the content, resource and locale entries from your legacy chrome.manifest via a call to registerChromeUrl().
+     */
+    messenger.WindowListener.registerChromeUrl([ 
+        ["content",  "keefox",                  "chrome/content/"],
+        ["resource", "keefox", "classic/1.0",   "chrome/skin/"],
+        ["resource", "kfmod",                   "modules/"],
+        ...locales.map((localeId) => 
+        ["locale",   "keefox", localeId,        `chrome/locale/${localeId}/`])
+    ]);
+    // https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisteroptionspage
+    messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xul")
+})()
\ No newline at end of file
diff --git a/xul-ext/chrome.manifest b/xul-ext/chrome.manifest
index 9a3b2fd..c6bd3f3 100644
--- a/xul-ext/chrome.manifest
+++ b/xul-ext/chrome.manifest
@@ -11,7 +11,7 @@ overlay chrome://messenger/content/messenger.xul chrome://keefox/content/panel.x
 overlay chrome://gdata-provider/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
 overlay chrome://messenger/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
 
-skin keefox classic/1.0 chrome/skin/
+resource keefox classic/1.0 chrome/skin/
 resource kfmod modules/
 
 # locales
diff --git a/xul-ext/manifest.json b/xul-ext/manifest.json
index 0fa9363..74ca517 100644
--- a/xul-ext/manifest.json
+++ b/xul-ext/manifest.json
@@ -1,26 +1,31 @@
 {
-	"applications": {
-		"gecko": {
-			"id": "keebird@kee-org",
-			"strict_min_version": "68.1.0",
-			"strict_max_version": "68.*"
-		}
-	},
-	"manifest_version": 2,
-	"name": "KeeBird",
-	"version": "2.0.1",
-	"author": "Chris Tomlinson",
-	"homepage_url": "http://github.com/kee-org/keebird",
-	"description": "Use KeePass Password Safe to manage your login credentials.",
-	"icons": {
-		"48": "icon.png",
-		"64": "icon64.png"
-	},
-	"legacy": {
-		"type": "xul",
-		"options": {
-			"page": "chrome://keefox/content/options.xul",
-			"open_in_tab": true
-		}
-	}
-}
\ No newline at end of file
+  "applications": {
+    "gecko": {
+      "id": "keebird-xn1@kee-org",
+      "strict_min_version": "68.1.0"
+    }
+  },
+  "manifest_version": 2,
+  "name": "KeeBird",
+  "version": "2.0.1",
+  "author": "Chris Tomlinson",
+  "homepage_url": "http://github.com/kee-org/keebird",
+  "description": "Use KeePass Password Safe to manage your login credentials.",
+  "icons": {
+    "48": "icon.png",
+    "64": "icon64.png"
+  },
+  "experiment_apis": {
+    "WindowListener": {
+      "schema": "api/windowListener/schema.json",
+      "parent": {
+        "scopes": ["addon_parent"],
+        "paths": [["WindowListener"]],
+        "script": "api/windowListener/implementation.js"
+      }
+    }
+  },
+  "background": {
+    "scripts": ["background.js"]
+  }
+}

From 2e3877e10d59add77321846d66fa0d6dde116061 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 23:25:29 +0100
Subject: [PATCH 15/25] WindowListener-API - commonDialog

---
 xul-ext/background.js                         | 30 +++++++++++++++--
 xul-ext/chrome/content/KFcommonDialog.js      | 10 ++++--
 .../chrome/content/scripts/KFcommonDialog.js  | 28 ++++++++++++++++
 .../chrome/content/scripts/messengerPanel.js  | 32 +++++++++++++++++++
 xul-ext/manifest.json                         |  9 +++++-
 5 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 xul-ext/chrome/content/scripts/KFcommonDialog.js
 create mode 100644 xul-ext/chrome/content/scripts/messengerPanel.js

diff --git a/xul-ext/background.js b/xul-ext/background.js
index 7918227..9188aff 100644
--- a/xul-ext/background.js
+++ b/xul-ext/background.js
@@ -36,11 +36,37 @@ const locales = [
      */
     messenger.WindowListener.registerChromeUrl([ 
         ["content",  "keefox",                  "chrome/content/"],
-        ["resource", "keefox", "classic/1.0",   "chrome/skin/"],
+        ["resource", "keefox", /*"classic/1.0", */  "chrome/skin/"],
         ["resource", "kfmod",                   "modules/"],
         ...locales.map((localeId) => 
         ["locale",   "keefox", localeId,        `chrome/locale/${localeId}/`])
     ]);
     // https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisteroptionspage
-    messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xul")
+    messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xul");
+
+/**
+ * Alternatives to overlays 
+ * 
+overlay chrome://browser/content/browser.xul chrome://keefox/content/panel.xul
+overlay chrome://browser/content/browser.xul chrome://keefox/content/context.xul
+-> chrome://browser/content/browser.xul could not be found, replaced by chrome://messenger/content/messenger.xul
+
+overlay	chrome://global/content/commonDialog.xul chrome://keefox/content/protocolAuth.xul
+
+overlay chrome://messenger/content/messenger.xul chrome://keefox/content/panel.xul
+
+# This is for the "Provider for Google Calendar" extension in Thunderbird
+overlay chrome://gdata-provider/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
+overlay chrome://messenger/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
+ */
+    //
+    messenger.WindowListener.registerWindow(
+        "chrome://messenger/content/messenger.xul", 
+        "chrome://keefox/content/scripts/messengerPanel.js");
+
+    messenger.WindowListener.registerWindow(
+        "chrome://global/content/commonDialog.xul", 
+        "chrome://keefox/content/scripts/KFcommonDialog.js");
+        
+    await messenger.WindowListener.startListening();
 })()
\ No newline at end of file
diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index 8851559..96f1ef6 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -39,6 +39,7 @@ if (!Cu)
 
 const { keefox_org } = ChromeUtils.import("resource://kfmod/KF.js");
 const { keeFoxLoginInfo } = ChromeUtils.import("resource://kfmod/kfDataModel.js");
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var keeFoxDialogManager = {
     scriptLoader : Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
@@ -141,7 +142,7 @@ var keeFoxDialogManager = {
         .getService(Components.interfaces.nsIXULAppInfo),
     
     dialogInit : function(e) {
-        window.removeEventListener("load", keeFoxDialogManager.dialogInit);
+        //window.removeEventListener("load", keeFoxDialogManager.dialogInit);
         try
         {
             document.addEventListener("dialogaccept", event => {
@@ -583,6 +584,10 @@ var keeFoxDialogManager = {
         }
     },
 
+    /**
+     * This is where we send the identification request to keefox RPC
+     * Assuming that the validation token has been stored
+     */
     updateDialog : function()
     {
         // check to make sure prepareFill was called
@@ -914,4 +919,5 @@ KPRPCConnectionObserver.prototype = {
 keeFoxDialogManager.Logger = keefox_org._KFLog;
 keeFoxDialogManager.scriptLoader.loadSubScript(
     "chrome://keefox/content/shared/uriUtils.js", keeFoxDialogManager);
-window.addEventListener("load", keeFoxDialogManager.dialogInit, false);
+//window.addEventListener("load", keeFoxDialogManager.dialogInit, false);
+
diff --git a/xul-ext/chrome/content/scripts/KFcommonDialog.js b/xul-ext/chrome/content/scripts/KFcommonDialog.js
new file mode 100644
index 0000000..bc8457b
--- /dev/null
+++ b/xul-ext/chrome/content/scripts/KFcommonDialog.js
@@ -0,0 +1,28 @@
+// Import any needed modules.
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+// Load an additional JavaScript file.
+Services.scriptloader.loadSubScript("chrome://keefox/content/KFcommonDialog.js", window, "UTF-8");
+//Services.scriptloader.loadSubScript("chrome://keefox/content/scripts/testPath.js", window, "UTF-8");
+
+// mimic 
+// overlay	chrome://global/content/commonDialog.xul chrome://keefox/content/protocolAuth.xul
+function onLoad(activatedWhileWindowOpen) {
+
+  WL.injectElements(`
+<overlay id="KeeFox-Common-Dialog-Overlay"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <window windowtype="navigator:browser"></window>
+</overlay>`);
+
+    window.keeFoxDialogManager.dialogInit();
+}
+
+function onUnload(deactivatedWhileWindowOpen) {
+  // Cleaning up the window UI is only needed when the
+  // add-on is being deactivated/removed while the window
+  // is still open. It can be skipped otherwise.
+  if (!deactivatedWhileWindowOpen) {
+    return
+  }
+}
\ No newline at end of file
diff --git a/xul-ext/chrome/content/scripts/messengerPanel.js b/xul-ext/chrome/content/scripts/messengerPanel.js
new file mode 100644
index 0000000..c5b576c
--- /dev/null
+++ b/xul-ext/chrome/content/scripts/messengerPanel.js
@@ -0,0 +1,32 @@
+// Import any needed modules.
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+// Load an additional JavaScript file.
+Services.scriptloader.loadSubScript("chrome://keefox/content/keefoxWin.js", window, "UTF-8");
+
+// mimic the overlay from chrome.manifest
+// overlay chrome://messenger/content/messenger.xul chrome://keefox/content/panel.xul
+function onLoad(activatedWhileWindowOpen) {
+  // Inject a XUL fragment (providing the needed DTD files as well)
+  // using the injectElements helper function. The added elements
+  // will be automatically removed on window unload.
+  //insertafter
+  WL.injectElements(`
+<overlay id="KeeFox-Overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <popupset>
+    <menupopup id="KeeFox-login-context" position="after_start">
+    </menupopup>
+    <menupopup id="KeeFox-group-context" position="after_start">
+    </menupopup>
+  </popupset>
+</overlay>`);
+}
+
+function onUnload(deactivatedWhileWindowOpen) {
+  // Cleaning up the window UI is only needed when the
+  // add-on is being deactivated/removed while the window
+  // is still open. It can be skipped otherwise.
+  if (!deactivatedWhileWindowOpen) {
+    return
+  }
+}
\ No newline at end of file
diff --git a/xul-ext/manifest.json b/xul-ext/manifest.json
index 74ca517..043968b 100644
--- a/xul-ext/manifest.json
+++ b/xul-ext/manifest.json
@@ -27,5 +27,12 @@
   },
   "background": {
     "scripts": ["background.js"]
-  }
+  },
+
+  "permissions": [
+      "storage",
+      "activeTab",
+      "tabs",
+      "tabHide"
+    ]
 }

From a084e484e3e6d7e94c870666a251ed92ae4f75da Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 23:26:04 +0100
Subject: [PATCH 16/25] WindowListener-API - install.xul/try

---
 xul-ext/background.js                     |   6 +-
 xul-ext/chrome/content/scripts/install.js | 384 ++++++++++++++++++++++
 2 files changed, 389 insertions(+), 1 deletion(-)
 create mode 100644 xul-ext/chrome/content/scripts/install.js

diff --git a/xul-ext/background.js b/xul-ext/background.js
index 9188aff..e607bb8 100644
--- a/xul-ext/background.js
+++ b/xul-ext/background.js
@@ -67,6 +67,10 @@ overlay chrome://messenger/content/browserRequest.xul chrome://keefox/content/gd
     messenger.WindowListener.registerWindow(
         "chrome://global/content/commonDialog.xul", 
         "chrome://keefox/content/scripts/KFcommonDialog.js");
-        
+    /*
+        messenger.WindowListener.registerWindow(
+            "chrome://global/content/win.xul",
+            "chrome://keefox/content/scripts/install.js");*/
+
     await messenger.WindowListener.startListening();
 })()
\ No newline at end of file
diff --git a/xul-ext/chrome/content/scripts/install.js b/xul-ext/chrome/content/scripts/install.js
new file mode 100644
index 0000000..51534ba
--- /dev/null
+++ b/xul-ext/chrome/content/scripts/install.js
@@ -0,0 +1,384 @@
+// Import any needed modules.
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+// Load an additional JavaScript file.
+Services.scriptloader.loadSubScript("chrome://keefox/content/install.js", window, "UTF-8");
+
+// mimic 
+// overlay	chrome://global/content/commonDialog.xul chrome://keefox/content/protocolAuth.xul
+function onLoad(activatedWhileWindowOpen) {
+
+  WL.injectElements(`
+<window id="KeeFoxInstallWizard" 
+windowtype="navigator:browser"
+title="%-KeeFox_Install_Setup_KeeFox.label-%" 
+xmlns:html="http://www.w3.org/1999/xhtml"
+xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<!-- installation cases:
+
+IC1: administrator and .NET not installed
+IC2: administrator, .NET installed and KeePass not installed
+IC3: administrator, .NET installed and KeePass installed
+IC4: non-administrator and .NET not installed
+IC5: non-administrator, .NET installed and KeePass not installed
+IC6: non-administrator, .NET installed and KeePass installed
+IC7: administrator, upgrade of KeePassRPC required
+IC8: non-administrator, upgrade of KeePassRPC required
+
+TODO:2: In some cases (especially IC6/8), user may not have priveledges to write
+to an existing KeePass directory. If this happens, we will catch the access 
+denied exception and give the user two choices:
+a) Get an administrator to install the KeePassRPC files in the plugins folder
+b) Choose a new installation directory for a seperate install of KeICE (warn
+that this may not work and could be confusing and/or against organistation's policy)
+
+
+outline of default and optional installation processes for each of the main cases
+=================================================================================
+
+IC1:
+default:    run .NET 4.0 installer;
+quietly run KeePass installer;
+copy the KeePassRPC.plgx file to the newly installed KP location.
+manual options:
+Download and install .NET from Microsoft; restart and return to this page OR
+download KeePass setup or ZIP from keepass.info; restart firefox to get back
+to this page so it can complete the last step OR manually copy KeePassRPC.plgx
+file from extension folder to plugin folder.
+
+IC2:
+default:    quietly run KeePass installer;
+copy the KeePassRPC.plgx file to the newly installed KP location.
+secondary:  run KeePass installer;
+copy the KeePassRPC.plgx file to the newly installed KP location.
+tertiary:   install KeePass ZIP contents into selected folder; [may be auto-skipped
+if KP found in there already]
+copy the KeePassRPC.plgx file to the newly installed KP location.
+
+IC3:
+default:    copy the KeePassRPC.plgx file to the discovered KP location.
+
+IC4:
+currently treated the same as IC1 (though a few visual differences are apparent
+to the user before the install process starts)
+
+IC5:
+default:    install KeePass ZIP contents into selected folder; [may be 
+auto-skipped if KP found in there already]
+copy the KeePassRPC.plgx file to the newly installed KP location.
+secondary:  run KeePass installer;
+copy the KeePassRPC.plgx file to the newly installed KP location.
+
+IC6:
+default:    copy the KeePassRPC.plgx file to the discovered KP location.
+
+IC7 and 8: Currently same as IC3/6 but will display different text to user            
+-->
+
+<grid flex="1" style="overflow: auto;">
+
+<!-- centre the installation window -->
+<columns>
+<column flex="1" />
+<column width="600px" />
+<column flex="1" />
+</columns>
+
+<rows>
+<row>
+<spacer flex="1"/>
+
+<vbox id="KFInstallPageMain" width="600px"  >
+
+<vbox id="KFInstallHeader">
+<image src='chrome://keefox/skin/install/header.png' width='580' height='116'/>
+</vbox>
+
+<vbox id="KFInstallPageTitle" width="590px" >
+<description id="KFInstallPageTitle_description">%-KeeFox_Install_Setup_KeeFox.label-%</description>
+</vbox>
+
+<vbox id="KFInstallPageContent" width="590px" >
+
+<vbox id="KFInstallAlreadyInProgress" hidden="true">
+<description id="desc_KFInstallAlreadyInProgress">%-KeeFox_Install_Process_Running_In_Other_Tab.label-%</description>
+</vbox>
+
+<vbox id="KFInstallNotRequired" hidden="true">
+<description id="desc_KFInstallNotRequired">%-KeeFox_Install_Not_Required.label-%</description>
+<label href="http://keefox.org/help" class="text-link" id="lab_KFInstallNotRequired">%-KeeFox_Install_Not_Required_Link.label-%</label>
+</vbox>
+
+<vbox id="netUpgradeRequired" hidden="true">
+<description id="desc_netUpgradeRequired">%-KeeFox_Install_NET_Upgrade_Required.label-%</description>
+<label href="https://www.microsoft.com/en-us/download/details.aspx?id=48130" class="text-link">.NET 4.6</label>
+<description id="desc_netUpgradeRequired_XP" style="margin-top: 15px;">%-KeeFox_Install_NET_Upgrade_Required_XP.label-%</description>
+<label href="https://download.microsoft.com/download/7/B/6/7B629E05-399A-4A92-B5BC-484C74B5124B/dotNetFx40_Client_setup.exe" class="text-link">.NET 4.0 (Windows XP)</label>
+<description id="desc_netUpgradeRequired_KeePass" style="margin-top: 15px;">%-KeeFox_Install_NET_Upgrade_Required_KeePass.label-%</description>
+<label href="https://sourceforge.net/projects/keepass/" class="text-link">KeePass</label>
+</vbox>
+
+<vbox id="ERRORInstallButtonMain" hidden="true">
+<description id="desc_ERRORInstallButtonMain">%-KeeFox_Install_Unexpected_Error.label-%</description>
+</vbox>
+<vbox id="ERRORInstallDownloadFailed" hidden="true">
+<description id="desc_ERRORInstallDownloadFailed">%-KeeFox_Install_Download_Failed.label-%</description>
+</vbox>
+<vbox id="ERRORInstallDownloadChecksumFailed" hidden="true">
+<description id="desc_ERRORInstallDownloadChecksumFailed">%-KeeFox_Install_Download_Checksum_Failed.label-%</description>
+</vbox>
+<vbox id="ERRORInstallDownloadCanceled" hidden="true">
+<description id="desc_ERRORInstallDownloadCanceled">%-KeeFox_Install_Download_Canceled.label-%</description>
+</vbox>
+
+<vbox id="restartInstallationOption" hidden="true">
+<button id="but_restartInstallationOption" label="%-KeeFox_Install_Try_Again_Button.label-%"
+oncommand="resetInstallation(); window.location.reload(true);"/>
+</vbox>
+
+
+<!-- everything in this box is displayed on first page load and hidden
+after installation has started -->
+<vbox style="width:600px;" id="installationStartView" hidden="false">
+
+<!-- these boxes can be styled to be big massive pretty "click me!" buttons -->
+
+<vbox id="installationFoundWarning" hidden="true">
+<description id="desc_installationFoundWarning" class="warning">%-KeeFox_Install_Already_Installed_Warning.description-%</description>
+</vbox>
+
+<!-- IC1, IC4 -->
+<vbox id="setupExeInstallButtonMain" hidden="true">
+<button id="but_setupExeInstallButtonMain" label="%-KeeFox_Install_Setup_KeeFox.label-%"
+oncommand="setupExeInstall();"/>
+</vbox>
+
+<!-- IC2 -->
+<vbox id="KPsetupExeSilentInstallButtonMain" hidden="true">
+<button id="but_KPsetupExeSilentInstallButtonMain" label="%-KeeFox_Install_Setup_KeeFox.label-%"
+oncommand="KPsetupExeSilentInstall();"/>
+</vbox>
+
+<!-- IC3, IC6 -->
+<vbox id="copyKRPCToKnownKPLocationInstallButtonMain" hidden="true">
+<button id="but_copyKRPCToKnownKPLocationInstallButtonMain" label="%-KeeFox_Install_Setup_KeeFox.label-%"
+oncommand="copyKRPCToKnownKPLocationInstall();"/>
+</vbox>
+
+<!-- IC5 -->
+<vbox id="copyKPToSpecificLocationInstallButtonMain" hidden="true">
+<!-- file chooser field needed -->
+<button id="but_copyKPToSpecificLocationInstallButtonMain" label="%-KeeFox_Install_copyKPToSpecificLocationInstallButton.label-%"
+oncommand="copyKPToSpecificLocationInstall();"/>
+</vbox>
+
+<!-- IC7, IC8 -->
+<vbox id="copyKRPCToKnownKPLocationUpgradeButtonMain" hidden="true">
+<description class="warning" hidden="true" id="desc_Install_ManualDowngradeWarning">%-KeeFox_Install_Downgrade_Warning.label-%</description>
+<description id="desc_copyKRPCToKnownKPLocationUpgradeButtonMain" class="warning">%-KeeFox_Install_PleaseCloseKeePass.description-%</description>
+<button id="but_copyKRPCToKnownKPLocationUpgradeButtonMain" label="%-KeeFox_Install_Upgrade_KeeFox.label-%"
+oncommand="copyKRPCToKnownKPLocationInstall();"/>
+</vbox>
+
+
+<!-- these boxes are used to provide a "click to see more options" interface to the user -->
+
+<vbox id="setupNET35ExeInstallExpandee" hidden="true">
+<description id="setupNET35ExeInstallExpandeeOverview">%-KeeFox_Install_setupNET35ExeInstallExpandeeOverview.description-%</description>
+<description id="setupNET35ExeInstallExpandeeKeePass">%-KeeFox_Install_setupNET35ExeInstallExpandeeKeePass.description-%</description>
+<!--<description id="setupNET35ExeInstallExpandeeNet">%-KeeFox_Install_setupNET35ExeInstallExpandeeNet.description-%</description>
+<vbox id="setupNET35ExeInstallButton">
+<button label="%-KeeFox_Install_setupNET35ExeInstallButton.label-%"
+oncommand="setupNET35ExeInstall();"/>
+</vbox>-->
+<description id="setupNET35ExeInstallExpandeeManual">%-KeeFox_Install_setupNET35ExeInstallExpandeeManual.description-%</description>
+<description id="setupNET35ExeInstallExpandeeManualStep1">%-KeeFox_Install_setupNET35ExeInstallExpandeeManualStep1.description-%</description>
+<description id="setupNET35ExeInstallExpandeeManualStep2">%-KeeFox_Install_setupNET35ExeInstallExpandeeManualStep2.description-%</description>
+<description id="setupNET35ExeInstallExpandeeManualStep3">%-KeeFox_Install_setupNET35ExeInstallExpandeeManualStep3.description-%</description>
+<description id="setupNET35ExeInstallExpandeeManualStep4">%-KeeFox_Install_setupNET35ExeInstallExpandeeManualStep4.description-%</description>
+
+</vbox>
+
+<!-- IC2 -->
+<vbox id="adminSetupKPInstallExpander" hidden="true">
+<description id="desc_adminSetupKPInstallExpander">%-KeeFox_Install_adminSetupKPInstallExpander.description-%</description>
+<button id="adminSetupKPInstallExpanderButton" 
+label="%-KeeFox_Install_adminSetupKPInstallExpander_More_Info_Button.label-%"
+oncommand="expandSection('adminSetupKPInstallExpandee',
+'adminSetupKPInstallExpanderButton');"/>
+</vbox>
+
+<!-- IC3 -->
+<vbox id="admincopyKRPCToKnownKPLocationInstallExpander" hidden="true">
+<description id="desc_admincopyKRPCToKnownKPLocationInstallExpander">%-KeeFox_Install_admincopyKRPCToKnownKPLocationInstallExpander.description-%</description>
+</vbox>
+
+<!-- IC5 -->
+<vbox id="nonAdminSetupKPInstallExpander" hidden="true">
+<description id="desc_nonAdminSetupKPInstallExpander">%-KeeFox_Install_nonAdminSetupKPInstallExpander.description-%</description>
+<!--<button id="nonAdminSetupKPInstallExpanderButton" 
+label="%-KeeFox_Install_nonAdminSetupKPInstallExpander_More_Info_Button.label-%"
+oncommand="expandSection('nonAdminSetupKPInstallExpandee',
+'nonAdminSetupKPInstallExpanderButton');"/>-->
+</vbox>
+
+<!-- IC6 -->
+<vbox id="nonAdmincopyKRPCToKnownKPLocationInstallExpander" hidden="true">
+<description id="desc_nonAdmincopyKRPCToKnownKPLocationInstallExpander">%-KeeFox_Install_nonAdmincopyKRPCToKnownKPLocationInstallExpander.description-%</description>
+<button id="nonAdmincopyKRPCToKnownKPLocationInstallExpanderButton" 
+label="%-KeeFox_Install_nonAdmincopyKRPCToKnownKPLocationInstallExpander_More_Info_Button.label-%"
+oncommand="expandSection('nonAdmincopyKRPCToKnownKPLocationInstallExpandee',
+'nonAdmincopyKRPCToKnownKPLocationInstallExpanderButton');"/>
+</vbox>
+
+<!-- these boxes contain buttons and text that helps guide the user through
+advanced install options -->
+
+<vbox id="adminSetupKPInstallExpandee" hidden="true">
+<description id="desc_adminSetupKPInstallExpandee">%-KeeFox_Install_adminSetupKPInstallExpandee.description-%</description>
+<vbox id="KPsetupExeInstallButton" hidden="false">
+<button id="but_KPsetupExeInstallButton" label="%-KeeFox_Install_KPsetupExeInstallButton.label-%"
+oncommand="KPsetupExeInstall();"/>
+</vbox>
+<description id="desc_adminSetupKPInstallExpandee2">%-KeeFox_Install_adminSetupKPInstallExpandeePortable.description-%</description>
+<vbox id="copyKPToSpecificLocationInstallButton" hidden="false">
+<!-- file chooser field needed -->
+<button id="but_copyKPToSpecificLocationInstallButton" label="%-KeeFox_Install_copyKPToSpecificLocationInstallButton.label-%"
+oncommand="copyKPToSpecificLocationInstall();"/>
+</vbox>
+</vbox>
+
+<vbox id="nonAdminSetupKPInstallExpandee" hidden="true">
+<description id="desc_nonAdminSetupKPInstallExpandee">%-KeeFox_Install_nonAdminSetupKPInstallExpandee.description-%</description>
+<vbox id="KPsetupExeSilentInstallButton" hidden="false">
+<button id="but_KPsetupExeSilentInstallButton" label="%-KeeFox_Install_KPsetupExeSilentInstallButton.label-%"
+oncommand="KPsetupExeSilentInstall();"/>
+</vbox>
+<vbox id="KPsetupExeInstallButton" hidden="false">
+<button id="but_KPsetupExeInstallButton" label="%-KeeFox_Install_KPsetupExeInstallButton.label-%"
+oncommand="KPsetupExeInstall();"/>
+</vbox>
+
+</vbox>
+
+<vbox id="nonAdmincopyKRPCToKnownKPLocationInstallExpandee" hidden="true">
+<description id="desc_nonAdmincopyKRPCToKnownKPLocationInstallExpandee">%-KeeFox_Install_nonAdmincopyKRPCToKnownKPLocationInstallExpandee.description-%</description>
+<vbox id="nonAdmincopyKRPCToKnownKPLocationInstallButton" hidden="false">
+<!-- file chooser field needed -->
+<button id="but_nonAdmincopyKRPCToKnownKPLocationInstallButton" label="%-KeeFox_Install_nonAdmincopyKRPCToKnownKPLocationInstallButton.label-%"
+oncommand="copyKPToSpecificLocationInstall();"/>
+</vbox>
+</vbox>
+
+</vbox>
+
+
+<!-- everything in this box is displayed during the installation process -->
+<vbox id="installProgressView" hidden="true">
+<vbox id="IC1setupNETdownloading" hidden="true">
+<description id="desc_IC1setupNETdownloading">%-KeeFox_Install_IC1setupNETdownloading.description-%</description>
+<html:progress max="100" id="IC1setupNETdownloadingProgressBar" mode="determined" value="0"/>
+<button id="but_IC1setupNETdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
+oncommand="cancelCurrentDownload();"/>
+</vbox>
+<vbox id="IC1setupNETdownloaded" hidden="true">
+<description id="desc_IC1setupNETdownloaded">%-KeeFox_Install_IC1setupNETdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC1setupKPdownloading" hidden="true">
+<description id="desc_IC1setupKPdownloading">%-KeeFox_Install_IC1setupKPdownloading.description-%</description>
+<html:progress max="100" id="IC1setupKPdownloadingProgressBar" mode="determined" value="0"/>
+<button id="but_IC1setupKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
+oncommand="cancelCurrentDownload();"/>
+</vbox>
+<vbox id="IC1setupKPdownloaded" hidden="true">
+<description id="desc_IC1setupKPdownloaded">%-KeeFox_Install_IC1setupKPdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC1KRPCdownloaded" hidden="true">
+<description id="desc_IC1KRPCdownloaded">%-KeeFox_Install_IC1KRPCdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC2setupKPdownloading" hidden="true">
+<description id="desc_IC2setupKPdownloading">%-KeeFox_Install_IC2setupKPdownloading.description-%</description>
+<html:progress max="100" id="IC2setupKPdownloadingProgressBar" mode="determined" value="0"/>
+<button id="but_IC2setupKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
+oncommand="cancelCurrentDownload();"/>
+</vbox>
+<vbox id="IC2setupKPdownloaded" hidden="true">
+<description id="desc_IC2setupKPdownloaded">%-KeeFox_Install_IC2setupKPdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC2KRPCdownloaded" hidden="true">
+<description id="desc_IC2KRPCdownloaded">%-KeeFox_Install_IC2KRPCdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC3installing" hidden="true">
+<description id="desc_IC3installing">%-KeeFox_Install_IC3installing.description-%</description>
+</vbox>
+
+<vbox id="IC5zipKPdownloading" hidden="true">
+<description id="desc_IC5zipKPdownloading">%-KeeFox_Install_IC5zipKPdownloading.description-%</description>
+<html:progress max="100" id="IC5zipKPdownloadingProgressBar" mode="determined" value="0"/>
+<button id="lab_IC5zipKPdownloading" label="%-KeeFox_Install_Cancel_Button.label-%"
+oncommand="cancelCurrentDownload();"/>
+</vbox>
+<vbox id="IC5zipKPdownloaded" hidden="true">
+<description id="desc_IC5zipKPdownloaded">%-KeeFox_Install_IC5zipKPdownloaded.description-%</description>
+</vbox>
+
+<vbox id="IC5installing" hidden="true">
+<description id="desc_IC5installing">%-KeeFox_Install_IC5installing.description-%</description>
+</vbox>
+
+</vbox>
+
+<!-- everything in this box is displayed when everything is installed correctly -->
+<vbox id="InstallFinished" hidden="true">
+<description id="desc_InstallFinished">%-KeeFox_Install_InstallFinished-2014.description-%</description>
+<description id="nextStepsIntro">%-KeeFox_Install_NextSteps.description-%</description>
+<hbox width="500px">
+<description id="nextStep1" width="50px">1)</description>
+<description id="desc_nextStep1" width="450px">%-KeeFox_Install_NextStep1.description-%</description>
+</hbox>
+<hbox width="500px">
+<description id="nextStep2" width="50px">2)</description>
+<label width="450px" id="nextStepsTutorialLink" href="http://tutorial.keefox.org/part1?utm_source=firefoxAddon&amp;utm_medium=postInstall" class="text-link">%-KeeFox_Install_NextStep2.description-%</label>
+</hbox>
+<hbox width="500px">
+<description id="nextStep3" width="50px">3)</description>
+<label width="450px" id="nextStepsImportLink" href="http://keefox.org/migration" class="text-link">%-KeeFox_Install_NextStep3.description-%</label>
+</hbox>
+
+<description id="nextStepsFinally">%-KeeFox_Install_Finally.description-% <label href="http://keefox.org/help" class="text-link">http://keefox.org/help</label></description>
+</vbox>
+
+<!-- everything in this box is displayed when everything is upgraded correctly -->
+<vbox id="UpgradeFinished" hidden="true">
+<description style="margin-bottom:10px;" id="desc_UpgradeFinished">%-KeeFox_Install_UpgradeFinished.description-%</description>
+<description id="nextStepsUpgradeFinally">
+%-KeeFox_Install_Finally.description-% <label href="http://keefox.org/help" class="text-link">http://keefox.org/help</label>
+</description>
+</vbox>
+</vbox> <!-- end KFInstallPageContent -->
+</vbox> <!-- end KFInstallPageMain -->
+
+<spacer flex="1"/>
+</row>
+</rows>
+</grid>
+
+</window>`);
+    window.prepareInstallPage();
+//prepareInstallPage
+//chrome://keefox/skin/install.css
+}
+
+function onUnload(deactivatedWhileWindowOpen) {
+  // Cleaning up the window UI is only needed when the
+  // add-on is being deactivated/removed while the window
+  // is still open. It can be skipped otherwise.
+  if (!deactivatedWhileWindowOpen) {
+    return
+  }
+}
\ No newline at end of file

From b57c2aac60e1f896a41e8efa13c5ac9daf4bfc9c Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Wed, 24 Mar 2021 23:26:22 +0100
Subject: [PATCH 17/25] comment

---
 xul-ext/modules/kprpcClient.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xul-ext/modules/kprpcClient.js b/xul-ext/modules/kprpcClient.js
index 18c8b1b..9144fbf 100644
--- a/xul-ext/modules/kprpcClient.js
+++ b/xul-ext/modules/kprpcClient.js
@@ -521,6 +521,9 @@ kprpcClient.prototype.constructor = kprpcClient;
         }
   	};
   	
+    /**
+     * Prompts the user for the token from keepass to allow RPC
+     */
   	this.identifyToClient = function(data) {
         var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                     .getService(Components.interfaces.nsIWindowMediator);

From 98fa3e798b535d09f2e5be86fc73a05c37a34d23 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 27 Mar 2021 09:25:18 +0100
Subject: [PATCH 18/25] WindowListener API: Finalizing xul->xhtml

---
 xul-ext/background.js                           | 17 +----------------
 .../content/{context.xul => context.xhtml}      |  2 +-
 .../{famsOptions.xul => famsOptions.xhtml}      |  0
 ...{gdata-provider.xul => gdata-provider.xhtml} |  0
 xul-ext/chrome/content/install.js               |  2 +-
 .../content/{install.xul => install.xhtml}      |  0
 xul-ext/chrome/content/install_mono.js          |  2 +-
 .../{install_mono.xul => install_mono.xhtml}    |  0
 xul-ext/chrome/content/options.js               |  2 +-
 .../content/{options.xul => options.xhtml}      |  6 +++---
 xul-ext/chrome/content/panel.js                 |  2 +-
 .../chrome/content/{panel.xul => panel.xhtml}   |  0
 .../{protocolAuth.xul => protocolAuth.xhtml}    |  0
 .../{siteOptions.xul => siteOptions.xhtml}      |  0
 xul-ext/modules/FAMS.js                         |  2 +-
 xul-ext/modules/KF.js                           |  4 ++--
 16 files changed, 12 insertions(+), 27 deletions(-)
 rename xul-ext/chrome/content/{context.xul => context.xhtml} (97%)
 rename xul-ext/chrome/content/{famsOptions.xul => famsOptions.xhtml} (100%)
 rename xul-ext/chrome/content/{gdata-provider.xul => gdata-provider.xhtml} (100%)
 rename xul-ext/chrome/content/{install.xul => install.xhtml} (100%)
 rename xul-ext/chrome/content/{install_mono.xul => install_mono.xhtml} (100%)
 rename xul-ext/chrome/content/{options.xul => options.xhtml} (98%)
 rename xul-ext/chrome/content/{panel.xul => panel.xhtml} (100%)
 rename xul-ext/chrome/content/{protocolAuth.xul => protocolAuth.xhtml} (100%)
 rename xul-ext/chrome/content/{siteOptions.xul => siteOptions.xhtml} (100%)

diff --git a/xul-ext/background.js b/xul-ext/background.js
index e607bb8..a3ac0fa 100644
--- a/xul-ext/background.js
+++ b/xul-ext/background.js
@@ -42,23 +42,8 @@ const locales = [
         ["locale",   "keefox", localeId,        `chrome/locale/${localeId}/`])
     ]);
     // https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisteroptionspage
-    messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xul");
+    messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xhtml");
 
-/**
- * Alternatives to overlays 
- * 
-overlay chrome://browser/content/browser.xul chrome://keefox/content/panel.xul
-overlay chrome://browser/content/browser.xul chrome://keefox/content/context.xul
--> chrome://browser/content/browser.xul could not be found, replaced by chrome://messenger/content/messenger.xul
-
-overlay	chrome://global/content/commonDialog.xul chrome://keefox/content/protocolAuth.xul
-
-overlay chrome://messenger/content/messenger.xul chrome://keefox/content/panel.xul
-
-# This is for the "Provider for Google Calendar" extension in Thunderbird
-overlay chrome://gdata-provider/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
-overlay chrome://messenger/content/browserRequest.xul chrome://keefox/content/gdata-provider.xul
- */
     //
     messenger.WindowListener.registerWindow(
         "chrome://messenger/content/messenger.xul", 
diff --git a/xul-ext/chrome/content/context.xul b/xul-ext/chrome/content/context.xhtml
similarity index 97%
rename from xul-ext/chrome/content/context.xul
rename to xul-ext/chrome/content/context.xhtml
index f505848..a86e876 100644
--- a/xul-ext/chrome/content/context.xul
+++ b/xul-ext/chrome/content/context.xhtml
@@ -56,7 +56,7 @@
     <menuitem id="KeeFox-menu_ToolsPopup-options" label="%-KeeFox_Tools-Menu.options.label-%..."
               insertafter="devToolsSeparator"
               oncommand='openDialog(
-               "chrome://keefox/content/options.xul",
+               "chrome://keefox/content/options.xhtml",
                "",
                "centerscreen,dialog=no,chrome,resizable,dependent,modal"
               );' />
diff --git a/xul-ext/chrome/content/famsOptions.xul b/xul-ext/chrome/content/famsOptions.xhtml
similarity index 100%
rename from xul-ext/chrome/content/famsOptions.xul
rename to xul-ext/chrome/content/famsOptions.xhtml
diff --git a/xul-ext/chrome/content/gdata-provider.xul b/xul-ext/chrome/content/gdata-provider.xhtml
similarity index 100%
rename from xul-ext/chrome/content/gdata-provider.xul
rename to xul-ext/chrome/content/gdata-provider.xhtml
diff --git a/xul-ext/chrome/content/install.js b/xul-ext/chrome/content/install.js
index 0961a24..b42e212 100644
--- a/xul-ext/chrome/content/install.js
+++ b/xul-ext/chrome/content/install.js
@@ -4,7 +4,7 @@ Copyright 2008-2015 Chris Tomlinson <keefox@christomlinson.name>
   
 This install.js file helps manage the installation of .NET, KeePass and KeePassRPC.
 
-See install.xul for a description of each of the ICs (Install Cases)
+See install.xhtml for a description of each of the ICs (Install Cases)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/xul-ext/chrome/content/install.xul b/xul-ext/chrome/content/install.xhtml
similarity index 100%
rename from xul-ext/chrome/content/install.xul
rename to xul-ext/chrome/content/install.xhtml
diff --git a/xul-ext/chrome/content/install_mono.js b/xul-ext/chrome/content/install_mono.js
index 903c1fb..c0ef9f8 100644
--- a/xul-ext/chrome/content/install_mono.js
+++ b/xul-ext/chrome/content/install_mono.js
@@ -4,7 +4,7 @@ Copyright 2008-2015 Chris Tomlinson <keefox@christomlinson.name>
   
 This install_mono.js file helps manage the installation under Mono.
 
-See install_mono.xul for a description of each of the ICs (Install Cases)
+See install_mono.xhtml for a description of each of the ICs (Install Cases)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/xul-ext/chrome/content/install_mono.xul b/xul-ext/chrome/content/install_mono.xhtml
similarity index 100%
rename from xul-ext/chrome/content/install_mono.xul
rename to xul-ext/chrome/content/install_mono.xhtml
diff --git a/xul-ext/chrome/content/options.js b/xul-ext/chrome/content/options.js
index b137258..7599ff5 100644
--- a/xul-ext/chrome/content/options.js
+++ b/xul-ext/chrome/content/options.js
@@ -559,7 +559,7 @@ function browseForLocation(currentLocationPath, pickerMode, captionStringKey, fi
 
 function openSiteConfig()
 {
-    window.openDialog("chrome://keefox/content/siteOptions.xul",
+    window.openDialog("chrome://keefox/content/siteOptions.xhtml",
     "siteoptions", "chrome,centerscreen", 
     onOK,
     onCancel,
diff --git a/xul-ext/chrome/content/options.xul b/xul-ext/chrome/content/options.xhtml
similarity index 98%
rename from xul-ext/chrome/content/options.xul
rename to xul-ext/chrome/content/options.xhtml
index a48ea3c..690f463 100644
--- a/xul-ext/chrome/content/options.xul
+++ b/xul-ext/chrome/content/options.xhtml
@@ -60,7 +60,7 @@
         <tabpanel>
           <vbox align="left">
             <description id="desc-site-specific" class="itemEnd">%-KeeFox-pref-site-options-find.desc-% <html:a id="desc-site-specific-link" class="text-link" onclick='javascript:openDialog(
-               "chrome://keefox/content/siteOptions.xul",
+               "chrome://keefox/content/siteOptions.xhtml",
                "",
                "centerscreen,dialog=no,chrome,resizable,dependent,modal"
               );'>%-KeeFox-pref-site-options-find.link-%</html:a>
@@ -136,7 +136,7 @@
 
             <description id="desc-site-specific-savepass" class="itemEnd">
               %-KeeFox-pref-site-options-savepass.desc-% <html:a id="desc-site-specific-savepass-link" class="text-link" onclick='javascript:openDialog(
-               "chrome://keefox/content/siteOptions.xul",
+               "chrome://keefox/content/siteOptions.xhtml",
                "",
                "centerscreen,dialog=no,chrome,resizable,dependent,modal"
               );'>%-KeeFox-pref-site-options-find.link-%</html:a>
@@ -181,7 +181,7 @@
             <checkbox id="notifyWhenLoggedOut" preference="extensions.keefox@chris.tomlinson.notifyWhenLoggedOut"
                     label="%-KeeFox-pref-notifyWhenLoggedOut.label-%" class="itemEnd"/>
             <button id="famsOptionsButton" label="%-KeeFox-FAMS-Options.label-%..." oncommand='openDialog(
-               "chrome://keefox/content/famsOptions.xul?famsConfigId=KeeFox",
+               "chrome://keefox/content/famsOptions.xhtml?famsConfigId=KeeFox",
                "",
                "centerscreen,dialog=no,chrome,resizable,dependent,modal"
               );' class="itemEnd"/>
diff --git a/xul-ext/chrome/content/panel.js b/xul-ext/chrome/content/panel.js
index 40eee25..3805b83 100644
--- a/xul-ext/chrome/content/panel.js
+++ b/xul-ext/chrome/content/panel.js
@@ -331,7 +331,7 @@ keefox_win.panel = {
         let options = this.createPanelSection(
             'KeeFox-PanelSection-options', 
             function () { openDialog(
-               "chrome://keefox/content/options.xul",
+               "chrome://keefox/content/options.xhtml",
                "",
                "centerscreen,dialog=no,chrome,resizable,dependent,modal"
               ); },
diff --git a/xul-ext/chrome/content/panel.xul b/xul-ext/chrome/content/panel.xhtml
similarity index 100%
rename from xul-ext/chrome/content/panel.xul
rename to xul-ext/chrome/content/panel.xhtml
diff --git a/xul-ext/chrome/content/protocolAuth.xul b/xul-ext/chrome/content/protocolAuth.xhtml
similarity index 100%
rename from xul-ext/chrome/content/protocolAuth.xul
rename to xul-ext/chrome/content/protocolAuth.xhtml
diff --git a/xul-ext/chrome/content/siteOptions.xul b/xul-ext/chrome/content/siteOptions.xhtml
similarity index 100%
rename from xul-ext/chrome/content/siteOptions.xul
rename to xul-ext/chrome/content/siteOptions.xhtml
diff --git a/xul-ext/modules/FAMS.js b/xul-ext/modules/FAMS.js
index 4841f24..105e57a 100644
--- a/xul-ext/modules/FAMS.js
+++ b/xul-ext/modules/FAMS.js
@@ -533,7 +533,7 @@ FirefoxAddonMessageService.prototype.showMessageNotification = function (name, a
                     var win = wm.getMostRecentWindow("navigator:browser") ||
                         wm.getMostRecentWindow("mail:3pane");
                     win.openDialog(
-                       "chrome://keefox/content/famsOptions.xul?famsConfigId=KeeFox", //TODO:2: KeeFox specific
+                       "chrome://keefox/content/famsOptions.xhtml?famsConfigId=KeeFox", //TODO:2: KeeFox specific
                        "",
                        "centerscreen,dialog=no,chrome,resizable,dependent,modal"
                       );
diff --git a/xul-ext/modules/KF.js b/xul-ext/modules/KF.js
index 3359ee3..fc74e32 100644
--- a/xul-ext/modules/KF.js
+++ b/xul-ext/modules/KF.js
@@ -226,11 +226,11 @@ KeeFox.prototype = {
         // Set the baseURL to use for Mono vs Windows
         if (!this.useMono)
         {
-            this.baseInstallURL = 'chrome://keefox/content/install.xul';
+            this.baseInstallURL = 'chrome://keefox/content/install.xhtml';
         }
         else
         {
-            this.baseInstallURL = 'chrome://keefox/content/install_mono.xul';
+            this.baseInstallURL = 'chrome://keefox/content/install_mono.xhtml';
         }
         
         this._KFLog.info("KeeFox initialising");

From b683dd08b6b8a63e95b8cd3082fb98e9988d28ec Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 27 Mar 2021 15:34:48 +0100
Subject: [PATCH 19/25] Replace textbox with html:input

---
 xul-ext/background.js                    |  5 +++--
 xul-ext/chrome/content/options.js        |  2 +-
 xul-ext/chrome/content/options.xhtml     | 14 +++++++-------
 xul-ext/chrome/content/siteOptions.xhtml | 16 ++++++++--------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/xul-ext/background.js b/xul-ext/background.js
index a3ac0fa..4dc6bc2 100644
--- a/xul-ext/background.js
+++ b/xul-ext/background.js
@@ -41,16 +41,17 @@ const locales = [
         ...locales.map((localeId) => 
         ["locale",   "keefox", localeId,        `chrome/locale/${localeId}/`])
     ]);
+    //xul-ext/chrome/skin
     // https://github.com/thundernest/addon-developer-support/wiki/WindowListener-API:-Getting-Started#windowlistenerregisteroptionspage
     messenger.WindowListener.registerOptionsPage("chrome://keefox/content/options.xhtml");
 
     //
     messenger.WindowListener.registerWindow(
-        "chrome://messenger/content/messenger.xul", 
+        "chrome://messenger/content/messenger.xhtml", 
         "chrome://keefox/content/scripts/messengerPanel.js");
 
     messenger.WindowListener.registerWindow(
-        "chrome://global/content/commonDialog.xul", 
+        "chrome://global/content/commonDialog.xhtml", 
         "chrome://keefox/content/scripts/KFcommonDialog.js");
     /*
         messenger.WindowListener.registerWindow(
diff --git a/xul-ext/chrome/content/options.js b/xul-ext/chrome/content/options.js
index 7599ff5..422da0c 100644
--- a/xul-ext/chrome/content/options.js
+++ b/xul-ext/chrome/content/options.js
@@ -228,7 +228,7 @@ function onCommandClick(evt)
 
     // swap label for a textbox
     var label = document.getElementById(evt.target.id);
-    var textbox = document.createElement("textbox");
+    var textbox = document.createElementNS("http://www.w3.org/1999/xhtml", "input");
     textbox.setAttribute("placeholder",window.keefox_org.locale.$STR("KeeFox-type-new-shortcut-key.placeholder"));
     textbox.setAttribute("id",evt.target.id+"-textbox");
     textbox.addEventListener("keydown", onCommandKeyDown, false);
diff --git a/xul-ext/chrome/content/options.xhtml b/xul-ext/chrome/content/options.xhtml
index 690f463..c709812 100644
--- a/xul-ext/chrome/content/options.xhtml
+++ b/xul-ext/chrome/content/options.xhtml
@@ -72,7 +72,7 @@
             <checkbox id="check-notifyWhenLateDiscovery" preference="extensions.keefox@chris.tomlinson.notifyWhenLateDiscovery" label="%-KeeFox-pref-notifyWhenLateDiscovery.label-%" class="itemEnd" />
             <hbox align="center" class="itemEnd">
               <label id="lab-maxMatchedLoginsInMainPanel" control="maxMatchedLoginsInMainPanel" value="%-KeeFox-pref-maxMatchedLoginsInMainPanel.label-%:"/>
-              <textbox preference="extensions.keefox@chris.tomlinson.maxMatchedLoginsInMainPanel" id="maxMatchedLoginsInMainPanel" maxlength="3" size="3" />
+              <html:input preference="extensions.keefox@chris.tomlinson.maxMatchedLoginsInMainPanel" id="maxMatchedLoginsInMainPanel" maxlength="3" size="3" />
             </hbox>
             
           </vbox>
@@ -188,13 +188,13 @@
             
             <hbox align="center">
               <label id="lab-keePassRPCPort" control="keePassRPCPort" value="%-KeeFox-pref-keePassRPCPort.label-%:"/>
-              <textbox preference="extensions.keefox@chris.tomlinson.KeePassRPC.webSocketPort" id="keePassRPCPort" maxlength="5" size="5"/>
+              <html:input preference="extensions.keefox@chris.tomlinson.KeePassRPC.webSocketPort" id="keePassRPCPort" maxlength="5" size="5"/>
             </hbox>
             <label id="lab-keePassRPCPortWarning" value="%-KeeFox-pref-keePassRPCPortWarning.label-%" class="itemEnd note"/>
 
             <label id="lab-keePassDBToOpen" control="keePassDBToOpen" value="%-KeeFox-pref-keePassDBToOpen.label-%:"/>
             <hbox class="itemEnd">
-              <textbox preference="extensions.keefox@chris.tomlinson.keePassDBToOpen" id="keePassDBToOpen" maxlength="255" size="80" />
+              <html:input preference="extensions.keefox@chris.tomlinson.keePassDBToOpen" id="keePassDBToOpen" maxlength="255" size="80" />
               <button id="keePassDBToOpenBrowseButton" label="%-KeeFox-browse.label-%..." oncommand="browseForDefaultKDBXLocation(document.getElementById('keePassDBToOpen').value);"/>
             </hbox>
 
@@ -208,25 +208,25 @@
           <vbox align="left">
             <label id="lab-keePassRPCInstalledLocation" control="keePassRPCInstalledLocation" value="%-KeeFox-pref-keePassRPCInstalledLocation.label-%:"/>            
             <hbox class="itemEnd" id="hbox-keePassRPCInstalledLocation">
-              <textbox preference="extensions.keefox@chris.tomlinson.keePassRPCInstalledLocation" id="keePassRPCInstalledLocation" maxlength="255" size="80" />
+              <html:input preference="extensions.keefox@chris.tomlinson.keePassRPCInstalledLocation" id="keePassRPCInstalledLocation" maxlength="255" size="80" />
               <button id="keePassRPCInstalledLocationBrowseButton" label="%-KeeFox-browse.label-%..." oncommand="browseForKPRPCLocation(document.getElementById('keePassRPCInstalledLocation').value);"/>
             </hbox>
             
             <label id="lab-keePassInstalledLocation" control="keePassInstalledLocation" value="%-KeeFox-pref-keePassInstalledLocation.label-%:"/>
             <hbox class="itemEnd">
-              <textbox preference="extensions.keefox@chris.tomlinson.keePassInstalledLocation" id="keePassInstalledLocation" maxlength="255" size="80" />
+              <html:input preference="extensions.keefox@chris.tomlinson.keePassInstalledLocation" id="keePassInstalledLocation" maxlength="255" size="80" />
               <button id="keePassInstalledLocationBrowseButton" label="%-KeeFox-browse.label-%..." oncommand="browseForKeePassLocation(document.getElementById('keePassInstalledLocation').value);"/>
             </hbox>
             
             <label id="lab-monoLocation" control="monoLocation" value="%-KeeFox-pref-monoLocation.label-%:" />
             <hbox class="itemEnd" id="hbox-monoLocation">
-              <textbox preference="extensions.keefox@chris.tomlinson.monoLocation" id="monoLocation" maxlength="255" size="80" />
+              <html:input preference="extensions.keefox@chris.tomlinson.monoLocation" id="monoLocation" maxlength="255" size="80" />
               <button id="monoLocationBrowseButton" label="%-KeeFox-browse.label-%..." oncommand="browseForMonoLocation(document.getElementById('monoLocation').value);"/>
             </hbox>
 
             <checkbox id="keePassRememberInstalledLocation" preference="extensions.keefox@chris.tomlinson.keePassRememberInstalledLocation" label="%-KeeFox-pref-keePassRememberInstalledLocation.label-%" class="itemEnd" />
             <label id="lab-keePassLocation" control="keePassLocation" value="%-KeeFox-pref-keePassLocation.label-%:"/>
-            <textbox preference="extensions.keefox@chris.tomlinson.currentLocation" id="keePassLocation" maxlength="128" size="40" class="itemEnd"/>
+            <html:input preference="extensions.keefox@chris.tomlinson.currentLocation" id="keePassLocation" maxlength="128" size="40" class="itemEnd"/>
 
           </vbox>
         </tabpanel>
diff --git a/xul-ext/chrome/content/siteOptions.xhtml b/xul-ext/chrome/content/siteOptions.xhtml
index 09781de..23bb91e 100644
--- a/xul-ext/chrome/content/siteOptions.xhtml
+++ b/xul-ext/chrome/content/siteOptions.xhtml
@@ -68,12 +68,12 @@
             <hbox class="listGroup">
               <checkbox id="gb-form-name-wl-enabled"/>
               <label id="gb-form-name-wl-lab" control="gb-form-name-wl" value="%-KeeFox-white-list-%" />
-              <textbox id="gb-form-name-wl" maxlength="50000" flex="2" />
+              <html:input id="gb-form-name-wl" maxlength="50000" flex="2" />
             </hbox>
             <hbox class="listGroup">
               <checkbox id="gb-form-name-bl-enabled"/>
               <label id="gb-form-name-bl-lab" control="gb-form-name-bl" value="%-KeeFox-black-list-%" />
-              <textbox id="gb-form-name-bl" maxlength="50000" flex="2" />
+              <html:input id="gb-form-name-bl" maxlength="50000" flex="2" />
             </hbox>
           </groupbox>
 
@@ -84,12 +84,12 @@
             <hbox class="listGroup">
               <checkbox id="gb-form-id-wl-enabled"/>
               <label id="gb-form-id-wl-lab" control="gb-form-id-wl" value="%-KeeFox-white-list-%" />
-              <textbox id="gb-form-id-wl" maxlength="50000" flex="2" />
+              <html:input id="gb-form-id-wl" maxlength="50000" flex="2" />
             </hbox>
             <hbox class="listGroup">
               <checkbox id="gb-form-id-bl-enabled"/>
               <label id="gb-form-id-bl-lab" control="gb-form-id-bl" value="%-KeeFox-black-list-%" />
-              <textbox id="gb-form-id-bl" maxlength="50000" flex="2" size="10" />
+              <html:input id="gb-form-id-bl" maxlength="50000" flex="2" size="10" />
             </hbox>
           </groupbox>
 
@@ -100,12 +100,12 @@
             <hbox class="listGroup">
               <checkbox id="gb-field-name-wl-enabled"/>
               <label id="gb-field-name-wl-lab" control="gb-field-name-wl" value="%-KeeFox-white-list-%" />
-              <textbox id="gb-field-name-wl" maxlength="50000" flex="2" />
+              <html:input id="gb-field-name-wl" maxlength="50000" flex="2" />
             </hbox>
             <hbox class="listGroup">
               <checkbox id="gb-field-name-bl-enabled"/>
               <label id="gb-field-name-bl-lab" control="gb-field-name-bl" value="%-KeeFox-black-list-%" />
-              <textbox id="gb-field-name-bl" maxlength="50000" flex="2" />
+              <html:input id="gb-field-name-bl" maxlength="50000" flex="2" />
             </hbox>
           </groupbox>
 
@@ -116,12 +116,12 @@
             <hbox class="listGroup">
               <checkbox id="gb-field-id-wl-enabled"/>
               <label id="gb-field-id-wl-lab" control="gb-field-id-wl" value="%-KeeFox-white-list-%" />
-              <textbox id="gb-field-id-wl" maxlength="50000" flex="2" />
+              <html:input id="gb-field-id-wl" maxlength="50000" flex="2" />
             </hbox>
             <hbox class="listGroup">
               <checkbox id="gb-field-id-bl-enabled"/>
               <label id="gb-field-id-bl-lab" control="gb-field-id-bl" value="%-KeeFox-black-list-%" />
-              <textbox id="gb-field-id-bl" maxlength="50000" flex="2" />
+              <html:input id="gb-field-id-bl" maxlength="50000" flex="2" />
             </hbox>
           </groupbox>
 

From 10fb48527f891cb78f0f4922a013da5a361b675e Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 27 Mar 2021 15:35:13 +0100
Subject: [PATCH 20/25] bump version

---
 xul-ext/manifest.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xul-ext/manifest.json b/xul-ext/manifest.json
index 043968b..7d77e9d 100644
--- a/xul-ext/manifest.json
+++ b/xul-ext/manifest.json
@@ -2,7 +2,7 @@
   "applications": {
     "gecko": {
       "id": "keebird-xn1@kee-org",
-      "strict_min_version": "68.1.0"
+      "strict_min_version": "78.1.0"
     }
   },
   "manifest_version": 2,
@@ -28,7 +28,6 @@
   "background": {
     "scripts": ["background.js"]
   },
-
   "permissions": [
       "storage",
       "activeTab",

From 7f6fa306ba29e9b197a9d4aa83d9c0be54684ed2 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sun, 28 Mar 2021 17:06:44 +0200
Subject: [PATCH 21/25] createElement -> createXULElement

---
 xul-ext/chrome/content/KFcommonDialog.js | 23 ++++++++++---------
 xul-ext/chrome/content/context.js        |  2 +-
 xul-ext/chrome/content/famsOptions.js    | 28 ++++++++++++------------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index 96f1ef6..f5c7602 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -375,7 +375,7 @@ var keeFoxDialogManager = {
                     }
                 }
             } // end if Thunderbird
-            
+
             if (host.length < 1)
             {
                 // e.g. en-US:
@@ -547,24 +547,23 @@ var keeFoxDialogManager = {
             this.mustAutoSubmit = mustAutoSubmit;
 
             /* add ui elements to dialog */
-            
-            var row = document.createElement("row");
+
+            var row = document.createElement("div");
             row.setAttribute("id","keefox-autoauth-row");
-            row.setAttribute("flex", "1");
+            row.setAttribute("class","dialogRow");
 
             // spacer to take up first column in layout
-            var spacer = document.createElement("spacer");
-            spacer.setAttribute("flex", "1");
+            var spacer = document.createElement("div");
             row.appendChild(spacer);
 
             // this box displays labels and also the list of entries when fetched
-            var box = document.createElement("hbox");
+            var box = document.createXULElement("hbox");
             box.setAttribute("id","keefox-autoauth-box");
             box.setAttribute("align", "center");
             box.setAttribute("flex", "1");
             box.setAttribute("pack", "start");
 
-            var loadingPasswords = document.createElement("description");
+            var loadingPasswords = document.createXULElement("description");
             loadingPasswords.setAttribute("id","keefox-autoauth-description");
             loadingPasswords.setAttribute("align", "start");
             loadingPasswords.setAttribute("flex", "1");
@@ -572,7 +571,7 @@ var keeFoxDialogManager = {
             row.appendChild(box);
 
             // button to lauch KeePass
-            var launchKeePassButton = document.createElement("button");
+            var launchKeePassButton = document.createXULElement("button");
             launchKeePassButton.setAttribute("id", "keefox-launch-kp-button");
             launchKeePassButton.setAttribute("label", keefox_org.locale.$STR("launchKeePass.label"));
             launchKeePassButton.addEventListener("command", function (event) { keefox_org.launchKeePass(''); }, false);
@@ -752,9 +751,9 @@ var keeFoxDialogManager = {
         if (showList) {
             var box = dialogFindLoginStorage.document.getElementById("keefox-autoauth-box");
 
-            var list = dialogFindLoginStorage.document.createElement("menulist");
+            var list = dialogFindLoginStorage.document.createXULElement("menulist");
             list.setAttribute("id","autoauth-list");
-            var popup = dialogFindLoginStorage.document.createElement("menupopup");
+            var popup = dialogFindLoginStorage.document.createXULElement("menupopup");
             var done = false;            
             
             for (var i = 0; i < matchedLogins.length; i++) {
@@ -770,7 +769,7 @@ var keeFoxDialogManager = {
             });
 
             for (var i = 0; i < matchedLogins.length; i++){
-                var item = dialogFindLoginStorage.document.createElement("menuitem");
+                var item = dialogFindLoginStorage.document.createXULElement("menuitem");
                 item.setAttribute("label", keefox_org.locale.$STRF("matchedLogin.label",
                     [matchedLogins[i].username, matchedLogins[i].host]));
                 item.setAttribute("tooltiptext", keefox_org.locale.$STRF("matchedLogin.tip",
diff --git a/xul-ext/chrome/content/context.js b/xul-ext/chrome/content/context.js
index 04d5b0a..72026b9 100644
--- a/xul-ext/chrome/content/context.js
+++ b/xul-ext/chrome/content/context.js
@@ -135,7 +135,7 @@ keefox_win.context = {
 
             var tempButton = i == 0 ? 
                                     container : 
-                                    this._currentWindow.document.createElement("menuitem");
+                                    this._currentWindow.document.createXULElement("menuitem");
             tempButton.setAttribute("label", keefox_org.locale.$STRF("matchedLogin.label"
                 , [usernameDisplayValue, login.title]));
             tempButton.setAttribute("class", "menuitem-iconic");
diff --git a/xul-ext/chrome/content/famsOptions.js b/xul-ext/chrome/content/famsOptions.js
index 6ae342a..9e9b00c 100644
--- a/xul-ext/chrome/content/famsOptions.js
+++ b/xul-ext/chrome/content/famsOptions.js
@@ -95,7 +95,7 @@ function go() {
 function renderAllMessageGroups()
 {
     var msgGroupContainer = window.document.getElementById("msgGroupContainer");
-    var famsDescription = window.document.createElement("description");    
+    var famsDescription = window.document.createXULElement("description");    
     famsDescription.textContent = FAMS.locale.internationaliseString(config.description);
     msgGroupContainer.appendChild(famsDescription);
     
@@ -112,11 +112,11 @@ function renderAllMessageGroups()
 function renderDownloadOptions()
 {
     var msgGroupContainer = window.document.getElementById("msgGroupContainer");
-    var downloadSliderComplete = window.document.createElement("hbox");
-    var downloadLabelExplanation = window.document.createElement("label");
-    var downloadLabelNote = window.document.createElement("description");
-    var downloadSlider = window.document.createElement("scale");
-    var downloadLabel = window.document.createElement("label");
+    var downloadSliderComplete = window.document.createXULElement("hbox");
+    var downloadLabelExplanation = window.document.createXULElement("label");
+    var downloadLabelNote = window.document.createXULElement("description");
+    var downloadSlider = window.document.createXULElement("scale");
+    var downloadLabel = window.document.createXULElement("label");
 
     downloadLabelExplanation.setAttribute("value", FAMS.getLocalisedString("Options-Download-Freq.label"));
     downloadLabelNote.textContent = FAMS.getLocalisedString("Options-Download-Freq.desc", config.name);
@@ -146,14 +146,14 @@ function renderMessageGroup(msgGroupIndex)
     var msgGroup = config.messageGroups[msgGroupIndex];
     var msgGroupContainer = window.document.getElementById("msgGroupContainer");
 
-    var singleMsgGroupContainer = window.document.createElement("vbox");
-    var desc = window.document.createElement("description");
-    var appearanceLabelNote = window.document.createElement("description");
-    var enabledCheckbox = window.document.createElement("checkbox");
-    var appearanceSliderComplete = window.document.createElement("hbox");
-    var appearanceLabelExplanation = window.document.createElement("label");
-    var appearanceSlider = window.document.createElement("scale");
-    var appearanceLabel = window.document.createElement("label");
+    var singleMsgGroupContainer = window.document.createXULElement("vbox");
+    var desc = window.document.createXULElement("description");
+    var appearanceLabelNote = window.document.createXULElement("description");
+    var enabledCheckbox = window.document.createXULElement("checkbox");
+    var appearanceSliderComplete = window.document.createXULElement("hbox");
+    var appearanceLabelExplanation = window.document.createXULElement("label");
+    var appearanceSlider = window.document.createXULElement("scale");
+    var appearanceLabel = window.document.createXULElement("label");
     //var seeAllButton = window.document.createElement("button");
     desc.textContent = FAMS.locale.internationaliseString(msgGroup.description);
 

From a84bfa1624603b6f77fab7667f3ed600a1072b47 Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sun, 28 Mar 2021 17:20:53 +0200
Subject: [PATCH 22/25] quick fix on resources

---
 xul-ext/chrome/content/KFcommonDialog.js | 167 ++++++++++++-----------
 1 file changed, 91 insertions(+), 76 deletions(-)

diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index f5c7602..06b6397 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -270,110 +270,125 @@ var keeFoxDialogManager = {
                     {
                         let regexChars = /[\[\{\(\)\*\+\?\.\\\^\$\|]/g;
                         protocols[aDialogType] = aDialogType.split("-")[0];
-                        titles[aDialogType] = aStringBundle.GetStringFromName(aTitlePropertyName);
-                        prompts[aDialogType] = aStringBundle.GetStringFromName(aPromptPropertyName);
-                        prompts[aDialogType] = prompts[aDialogType].replace(regexChars, "\\$&");
-                        aHostPlaceholder = aHostPlaceholder.replace(regexChars, "\\$&");
-                        // use null as a flag to indicate that there was only one
-                        // placeholder and hostIsFirst and secondIsUserName are not applicable
-                        hostIsFirst[aDialogType] = null;
-                        if (aUserPlaceholder != null)
-                        {
-                            aUserPlaceholder = aUserPlaceholder.replace(regexChars, "\\$&");
-                            hostIsFirst[aDialogType] = prompts[aDialogType].indexOf(aHostPlaceholder) <
-                                prompts[aDialogType].indexOf(aUserPlaceholder);
-                            secondIsUserName[aDialogType] = true;
-                        }
-                        if (aRealmPlaceholder != null)
-                        {
-                            aRealmPlaceholder = aRealmPlaceholder.replace(regexChars, "\\$&");
-                            hostIsFirst[aDialogType] = prompts[aDialogType].indexOf(aHostPlaceholder) <
-                                prompts[aDialogType].indexOf(aRealmPlaceholder);
-                            secondIsUserName[aDialogType] = false;
-                        }
-                        prompts[aDialogType] = prompts[aDialogType].replace(aHostPlaceholder, "([^\\s]+)");
-                        if (aUserPlaceholder != null)
-                        {
-                            prompts[aDialogType] = prompts[aDialogType].replace(aUserPlaceholder, "([^\\s]+)");
+                        // dirty fix
+                        // use a big try/catch here to avoid errors on null string resources
+                        try {
+                            titles[aDialogType] = aStringBundle.GetStringFromName(aTitlePropertyName);
+                            prompts[aDialogType] = aStringBundle.GetStringFromName(aPromptPropertyName);
+                            titles[aDialogType] = titles[aDialogType].replace(regexChars, "\\$&");
+                            prompts[aDialogType] = prompts[aDialogType].replace(regexChars, "\\$&");
+                            aHostPlaceholder = aHostPlaceholder.replace(regexChars, "\\$&");
+                            // use null as a flag to indicate that there was only one
+                            // placeholder and hostIsFirst and secondIsUserName are not applicable
+                            hostIsFirst[aDialogType] = null;
+                            if (aUserPlaceholder != null)
+                            {
+                                aUserPlaceholder = aUserPlaceholder.replace(regexChars, "\\$&");
+                                hostIsFirst[aDialogType] = prompts[aDialogType].indexOf(aHostPlaceholder) <
+                                    prompts[aDialogType].indexOf(aUserPlaceholder);
+                                secondIsUserName[aDialogType] = true;
+                            }
+                            if (aRealmPlaceholder != null)
+                            {
+                                aRealmPlaceholder = aRealmPlaceholder.replace(regexChars, "\\$&");
+                                hostIsFirst[aDialogType] = prompts[aDialogType].indexOf(aHostPlaceholder) <
+                                    prompts[aDialogType].indexOf(aRealmPlaceholder);
+                                secondIsUserName[aDialogType] = false;
+                            }
+                            titles[aDialogType] = titles[aDialogType].replace(aHostPlaceholder, "([^\\s]+)");
+                            prompts[aDialogType] = prompts[aDialogType].replace(aHostPlaceholder, "([^\\s]+)");
+                            if (aUserPlaceholder != null)
+                            {
+                                titles[aDialogType] = titles[aDialogType].replace(aUserPlaceholder, "([^\\s]+)");
+                                prompts[aDialogType] = prompts[aDialogType].replace(aUserPlaceholder, "([^\\s]+)");
+                            }
+                            if (aRealmPlaceholder != null)
+                            {
+                                prompts[aDialogType] = prompts[aDialogType].replace(aRealmPlaceholder, "([^\\s]+)");
+                            }
+                            extractUserFromHost[aDialogType] = aExtractUserFromHost;
                         }
-                        if (aRealmPlaceholder != null)
-                        {
-                            prompts[aDialogType] = prompts[aDialogType].replace(aRealmPlaceholder, "([^\\s]+)");
+                        catch (resourceError) {
+                            keefox_org._KFLog.error(`LoadDialogData failed for ${aDialogType},${aTitlePropertyName},${aPromptPropertyName}`, resourceError); 
                         }
-                        extractUserFromHost[aDialogType] = aExtractUserFromHost;
                     }
-                }
-                  
-                LoadDialogData(this._composeBundle, "smtp", "smtpEnterPasswordPromptTitle",
+                };
+                LoadDialogData(this._composeBundle, "smtp", "smtpEnterPasswordPrompt",
                     "smtpEnterPasswordPromptWithUsername", "%1$S", null, "%2$S");
+                    
                 var imapEnterPasswordPromptTitle = this._imapBundleUsesStrings
-                    ? "imapEnterPasswordPromptTitle" : "5051";
+                    ? "imapEnterPasswordPromptTitleWithUsername" : "5051";
                 var imapEnterPasswordPrompt = this._imapBundleUsesStrings
-                    ? "imapEnterPasswordPrompt" : "5047";
-                var isPreTB40ImapStrings = true;
-                try {
+                    ? "imapEnterServerPasswordPrompt" : "5047";
+                var isPreTB40ImapStrings = false;
+                /*try {
                     // Take a peek at imapEnterPasswordPrompt
                     this._imapMsgsBundle.GetStringFromName(imapEnterPasswordPrompt);
                 } catch (e) {
                     // The string identifier changed again in TB 40
                     imapEnterPasswordPrompt = "imapEnterServerPasswordPrompt";
                     isPreTB40ImapStrings = false;
-                }
+                }*/
                 // The prompt changed from using one parameter to using two in TB40
                 LoadDialogData(this._imapMsgsBundle, "imap",
                     imapEnterPasswordPromptTitle, imapEnterPasswordPrompt,
                     isPreTB40ImapStrings ? "%S" : "%2$S", null,
                     isPreTB40ImapStrings ? null : "%1$S", isPreTB40ImapStrings);
-                LoadDialogData(this._localMsgsBundle, "pop3", "pop3EnterPasswordPromptTitle",
-                    "pop3EnterPasswordPrompt", "%2$S", null, "%1$S");
+
+                LoadDialogData(this._localMsgsBundle, "pop3", "pop3EnterPasswordPromptTitleWithUsername",
+                    "pop3EnterPasswordPromptTitleWithUsername", "%2$S", null, "%1$S");
+
                 LoadDialogData(this._newsBundle, "nntp-1", "enterUserPassTitle",
                     "enterUserPassServer", "%S");
+                    
                 LoadDialogData(this._newsBundle, "nntp-2", "enterUserPassTitle",
                     "enterUserPassGroup", "%2$S", "%1$S");
+                    
                 LoadDialogData(this._messengerBundle, "mail", "passwordTitle",
                     "passwordPrompt", "%2$S", null, "%1$S");
                 
-                for (let type in titles)
-                {                  
-                    if (Dialog.args.title == titles[type])
-                    {
-                        // some types have the same title, so we have more checking to do
-                        let regEx = new RegExp(prompts[type]);
-                        let matches = Dialog.args.text.match(regEx);
-                        if (!matches)
-                        {
-                            continue;
-                        }
-                        if (hostIsFirst[type] === null) {
-                            // there is only one parameter, so nothing is first
-                            if (matches.length == 2) {
-                                if (extractUserFromHost[type])
-                                {
-                                    // user and host are separated by @ character
-                                    let lastAtSym = matches[1].lastIndexOf("@");                            
-                                    username = matches[1].substring(0, lastAtSym);
-                                    host = protocols[type] + "://" +
-                                        matches[1].substring(lastAtSym + 1, matches[1].length);
-                                } else {
-                                    host = protocols[type] + "://" + matches[1];
-                                }
-                                break;
+                const matchings = Object.keys(titles).filter((type) => {
+                    // refactor the title identification with a regEx because some have placeholders like $S
+                    let reTitle = new RegExp(titles[type]);
+                    return reTitle.test(Dialog.args.title);
+                }).map((type) => {
+                    let regEx = new RegExp(prompts[type]);
+                    let matches = Dialog.args.text.match(regEx);
+                    return {
+                        type,
+                        matches
+                    };
+                });
+
+                matchings.forEach((m) => {
+                    const type = m.type;
+                    const matches = m.matches;
+                    if (hostIsFirst[type] === null) {
+                        // there is only one parameter, so nothing is first
+                        if (matches.length == 2) {
+                            if (extractUserFromHost[type])
+                            {
+                                // user and host are separated by @ character
+                                let lastAtSym = matches[1].lastIndexOf("@");                            
+                                username = matches[1].substring(0, lastAtSym);
+                                host = protocols[type] + "://" +
+                                    matches[1].substring(lastAtSym + 1, matches[1].length);
+                            } else {
+                                host = protocols[type] + "://" + matches[1];
                             }
-                        } else
-                        {
-                            if (matches.length == 3) {
-                                if (hostIsFirst[type]) {
-                                    host = protocols[type] + "://" + matches[1];
-                                    username = matches[2];
-                                } else {
-                                    host = protocols[type] + "://" + matches[2];
-                                    username = matches[1];
-                                }
-                                break;
+                        }
+                    } else {
+                        if (matches.length == 3) {
+                            if (hostIsFirst[type]) {
+                                host = protocols[type] + "://" + matches[1];
+                                username = matches[2];
+                            } else {
+                                host = protocols[type] + "://" + matches[2];
+                                username = matches[1];
                             }
                         }
                     }
-                }
+                });
             } // end if Thunderbird
 
             if (host.length < 1)

From 73a04561f3e5f93d3e441b833ea9da259dff4dff Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sun, 28 Mar 2021 17:39:19 +0200
Subject: [PATCH 23/25] display addon options

---
 xul-ext/chrome/content/options.js    | 4 +++-
 xul-ext/chrome/content/options.xhtml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xul-ext/chrome/content/options.js b/xul-ext/chrome/content/options.js
index 422da0c..98ee62f 100644
--- a/xul-ext/chrome/content/options.js
+++ b/xul-ext/chrome/content/options.js
@@ -564,4 +564,6 @@ function openSiteConfig()
     onOK,
     onCancel,
     null);
-}
\ No newline at end of file
+}
+
+onLoad();
\ No newline at end of file
diff --git a/xul-ext/chrome/content/options.xhtml b/xul-ext/chrome/content/options.xhtml
index c709812..8a43a07 100644
--- a/xul-ext/chrome/content/options.xhtml
+++ b/xul-ext/chrome/content/options.xhtml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet href="chrome://keefox/skin/options.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>

From d9e713e4840d7ac64d01fbe7be3c1c10156cb35d Mon Sep 17 00:00:00 2001
From: antixn <xavier.nogue@gmail.com>
Date: Sat, 7 Aug 2021 17:46:15 +0200
Subject: [PATCH 24/25] smtp - check alt popup title

---
 xul-ext/chrome/content/KFcommonDialog.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index 06b6397..155980c 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -316,6 +316,18 @@ var keeFoxDialogManager = {
                 LoadDialogData(this._composeBundle, "smtp", "smtpEnterPasswordPrompt",
                     "smtpEnterPasswordPromptWithUsername", "%1$S", null, "%2$S");
                     
+                // SMTP alt
+                // title  "Password Required for Outgoing (SMTP) Server %1$S"
+                // prompt "Enter your password for %2$S on %1$S:"
+                // see omni.ja/chrome/en-US/locale/en-US/messenger/messengercompose/composeMsgs.properties
+                LoadDialogData(this._composeBundle, 
+                    "smtp2", 
+                    "smtpEnterPasswordPromptTitleWithHostname",
+                    "smtpEnterPasswordPromptWithUsername", 
+                    "%1$S", 
+                    null, 
+                    "%2$S");
+                    
                 var imapEnterPasswordPromptTitle = this._imapBundleUsesStrings
                     ? "imapEnterPasswordPromptTitleWithUsername" : "5051";
                 var imapEnterPasswordPrompt = this._imapBundleUsesStrings

From 4b9ca3a90e9bed8617569231d385c86171782be7 Mon Sep 17 00:00:00 2001
From: snodo <snodohome@web.de>
Date: Mon, 9 Aug 2021 09:21:58 +0200
Subject: [PATCH 25/25] fix regression created in
 a84bfa1624603b6f77fab7667f3ed600a1072b47

---
 xul-ext/chrome/content/KFcommonDialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xul-ext/chrome/content/KFcommonDialog.js b/xul-ext/chrome/content/KFcommonDialog.js
index 155980c..1ccb761 100644
--- a/xul-ext/chrome/content/KFcommonDialog.js
+++ b/xul-ext/chrome/content/KFcommonDialog.js
@@ -377,7 +377,7 @@ var keeFoxDialogManager = {
                     const matches = m.matches;
                     if (hostIsFirst[type] === null) {
                         // there is only one parameter, so nothing is first
-                        if (matches.length == 2) {
+                        if (matches !== null && matches.length == 2) {
                             if (extractUserFromHost[type])
                             {
                                 // user and host are separated by @ character
@@ -390,7 +390,7 @@ var keeFoxDialogManager = {
                             }
                         }
                     } else {
-                        if (matches.length == 3) {
+                        if (matches !== null && matches.length == 3) {
                             if (hostIsFirst[type]) {
                                 host = protocols[type] + "://" + matches[1];
                                 username = matches[2];