ESR115 support

CamielBouchier · Jul 28, 2023 · 540875c · 540875c
1 parent 817f8d9
commit 540875c
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 15 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,3 +1,10 @@
+Release_1_7_2
+=============
+
+* Support for ESR115
+* Implemented https://github.com/CamielBouchier/cb_thunderlink/issues/59
+* Implemented https://github.com/CamielBouchier/cb_thunderlink/issues/58
+
 Release_1_7_1
 =============
 

diff --git a/mail_extension/cb_api.js b/mail_extension/cb_api.js
@@ -46,8 +46,8 @@ var cb_api = class extends ExtensionCommon.ExtensionAPI {
     getAPI(context) {
         return {
             cb_api: {
-                cb_show_message_from_api_id(api_id, open_mode) {
-                    console.log("cb_show_message_from_api_id", api_id, open_mode)
+                cb_show_message_from_api_id(tb_version, api_id, open_mode) {
+                    console.log("cb_show_message_from_api_id", tb_version, api_id, open_mode)
                     // See : https://thunderbird-webextensions.readthedocs.io/en/latest/how-to/experiments.html
                     // #using-folder-and-message-types
                     let the_message = context.extension.messageManager.get(api_id)
@@ -65,15 +65,21 @@ var cb_api = class extends ExtensionCommon.ExtensionAPI {
                             let tabmail = win.document.getElementById("tabmail")
                             tabmail.switchToTab(0) //will always be the mail tab
                             win.focus()
-		                    win.gFolderTreeView.selectFolder(the_message.folder)
-		                    win.gFolderDisplay.selectMessage(the_message)
+                            if (tb_version <= 102) {
+		                        win.gFolderTreeView.selectFolder(the_message.folder)
+		                        win.gFolderDisplay.selectMessage(the_message)
+                            } else {
+                                win.gTabmail.tabInfo[0].folder = the_message.folder
+                                win.gTabmail.currentAbout3Pane.selectMessage(the_message)
+                            }
                         } else {
 		                    MailUtils.displayMessage(the_message)
 		                }
 		            }
                 },
-                cb_show_message_from_msg_id(msg_id, open_mode, prefer_folders, avoid_folders) {
-                    console.log("cb_show_message_from_msg_id", msg_id, open_mode, prefer_folders, avoid_folders)
+                cb_show_message_from_msg_id(tb_version, msg_id, open_mode, prefer_folders, avoid_folders) {
+                    console.log("cb_show_message_from_msg_id", 
+                                tb_version, msg_id, open_mode, prefer_folders, avoid_folders)
                     let query = Gloda.newQuery(CB_NOUN_MESSAGE)
 		            query.headerMessageID(msg_id)
                     query.getCollection({
@@ -127,8 +133,13 @@ var cb_api = class extends ExtensionCommon.ExtensionAPI {
                                     let tabmail = win.document.getElementById("tabmail")
                                     tabmail.switchToTab(0) //will always be the mail tab
                                     win.focus()
-		                            win.gFolderTreeView.selectFolder(the_message.folder)
-		                            win.gFolderDisplay.selectMessage(the_message)
+                                    if (tb_version <= 102) {
+		                                win.gFolderTreeView.selectFolder(the_message.folder)
+		                                win.gFolderDisplay.selectMessage(the_message)
+                                    } else {
+                                        win.gTabmail.tabInfo[0].folder = the_message.folder
+                                        win.gTabmail.currentAbout3Pane.selectMessage(the_message)
+                                    }
                                 } else {
 		                            MailUtils.displayMessage(the_message)
 		                        }

diff --git a/mail_extension/cb_api_schema.json b/mail_extension/cb_api_schema.json
@@ -10,6 +10,11 @@
             "async": true,
             "parameters": 
                 [
+		    {
+	            "name": "tb_version",
+                    "type": "integer",
+                    "description": "The tb_version."
+                    },
                     {
                     "name": "api_id",
                     "type": "integer",
@@ -29,6 +34,11 @@
             "async": true,
             "parameters": 
                 [
+		    {
+	            "name": "tb_version",
+                    "type": "integer",
+                    "description": "The tb_version."
+                    },
                     {
                     "name": "msg_id",
                     "type": "string",

diff --git a/mail_extension/cb_background.js b/mail_extension/cb_background.js
@@ -157,6 +157,15 @@ browser.storage.onChanged.addListener(
 
 get_settings() // Actually will kick us of, generating the context menus.
 
+var tb_version
+
+async function get_version() {
+    let v = await browser.runtime.getBrowserInfo()
+    tb_version = parseInt(v.version.split('.')[0])
+}
+
+get_version()
+
 //
 // https://base64.guru/developers/javascript/examples/unicode-strings
 //
@@ -288,17 +297,25 @@ async function create_context_menu() {
             contexts : ['message_list'],
             title    : conf_link.name,
             parentId : main_context_id,
-            id       : 'sub_context_menu_' + i,
-            onclick  : on_context_menu
+            id       : 'sub_context_menu_' + i
         });
 
         // add sub menu entry to the selection menu
         browser.menus.create({
             contexts : ['selection', 'tab', 'page'],
             title    : conf_link.name,
             parentId : selection_context_id,
-            onclick  : (info, tab) => on_context_menu_selection(i, info, tab),
+            id       : 'other_menu_'+ i
         });
+
+        browser.menus.onClicked.addListener((info, tab) => {
+            if (info.menuItemId.startsWith('sub_context_menu_')) {
+                on_context_menu(info)
+            }
+            if (info.menuItemId.startsWith('other_menu_')) {
+                on_context_menu_selection(info, tab)
+            }
+        })
     }
 }
 
@@ -316,7 +333,8 @@ async function on_context_menu(e) {
 //
 // Handle menu entries from the right click menu in a (message) tab
 //
-async function on_context_menu_selection(idx, info, tab) {
+async function on_context_menu_selection(info, tab) {
+    let idx = info.menuItemId.replace('other_menu_', '')
     let message = await messenger.messageDisplay.getDisplayedMessage(tab.id);
 
     if (!message) {
@@ -402,12 +420,15 @@ async function handle_incoming_link(incoming_link) {
             console.error("Investigate me. the_message == null. ml:",ml)
             return
         }
-        messenger.cb_api.cb_show_message_from_api_id(the_message.id, open_mode)
+        messenger.cb_api.cb_show_message_from_api_id(tb_version, 
+                                                     the_message.id, 
+                                                     open_mode)
     }
 
     if (link_type == 'thunderlink') {
         msg_id =  link.replace('messageid=', '')
-        messenger.cb_api.cb_show_message_from_msg_id(msg_id,
+        messenger.cb_api.cb_show_message_from_msg_id(tb_version,
+                                                     msg_id,
                                                      open_mode,
                                                      settings.prefer_folders,
                                                      settings.avoid_folders)

diff --git a/mail_extension/cb_thunderlink.xpi.tmp b/mail_extension/cb_thunderlink.xpi.tmp
diff --git a/mail_extension/manifest.json b/mail_extension/manifest.json
@@ -1,6 +1,6 @@
 {
     "manifest_version": 2,
-    "version": "1.7.1",
+    "version": "1.7.2",
     "name": "cb_thunderlink",
     "description": "cb_thunderlink is a thunderlink replacement.",
     "author": "camiel@bouchier.be",