Fix incompatibility with Thunderbird 115 (#364)

Author: lieser

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 ### Enhancements
 
+- Fixed incompatibility with Thunderbird 115 (#364).
 - Support the offline mode of Thunderbird.
   No DNS queries are done if Thunderbird is in the offline mode (#129).
 - JSDNS: Support IPv6 addresses (#363)

experiments/dkimHeader.js

@@ -1096,7 +1096,7 @@ class DkimResetMessageListener {
 	 */
 	static register(window) {
 		if (DkimResetMessageListener.#mapping.has(window)) {
-			console.error("MessageListener.register(): already registered");
+			console.error("DkimResetMessageListener.register(): already registered");
 		}
 		const messageListener = new DkimResetMessageListener(window);
 		DkimResetMessageListener.#mapping.set(window, messageListener);
@@ -1340,13 +1340,18 @@ this.dkimHeader = class extends ExtensionCommon.ExtensionAPI {
 		}
 
 		const displayedMessages = ExtensionParent.apiManager.global.getDisplayedMessages(tab);
-		const id = displayedMessages[0]?.id;
-		if (id === undefined || displayedMessages.length !== 1) {
+		let displayedMessage = displayedMessages[0];
+		if (!displayedMessage || displayedMessages.length !== 1) {
 			return {
 				window: msgWindow,
 				id: null,
 			};
 		}
+		if (!("id" in displayedMessage)) {
+			// TB >= 115
+			displayedMessage = this.extension.messageManager.convert(displayedMessage);
+		}
+		const id = displayedMessage.id;
 		return {
 			window: msgWindow,
 			id,

experiments/mozilla.d.ts

@@ -67,7 +67,7 @@ declare module ExtensionCommon {
         ////////////////////////////////////////////////////////////////////////
         //// https://searchfox.org/comm-central/source/mail/components/extensions/parent/ext-mail.js
         readonly messageManager: {
-            readonly convert: (msgDBHdr: nsIMsgDBHdr) => browser.messageDisplay.MessageHeader;
+            readonly convert: (msgDBHdr: nsIMsgDBHdr) => browser.messages.MessageHeader;
             readonly get: (messageId: number) => nsIMsgDBHdr;
         };
         readonly tabManager: ExtensionParentM.TabManagerBase;
@@ -133,7 +133,8 @@ declare module ExtensionParentM {
         declare module global {
             const tabTracker: TabTrackerBase;
 
-            const getDisplayedMessages: (tab: TabBase) => browser.messageDisplay.MessageHeader[];
+            // Returns nsIMsgDBHdr in TB >= 115
+            const getDisplayedMessages: (tab: TabBase) => browser.messages.MessageHeader[] | nsIMsgDBHdr[];
         }
     }
 }

experiments/mozillaDom.d.ts

@@ -3,7 +3,8 @@ interface Document {
 }
 
 interface Window {
-    readonly gFolderDisplay: { selectedMessage: nsIMsgDBHdr };
+    // Removed in TB 111
+    readonly gFolderDisplay?: { selectedMessage: nsIMsgDBHdr };
     readonly gMessageListeners: object[];
     // Removed in TB 99
     readonly OnResizeExpandedHeaderView?: () => void;

manifest.json

@@ -10,7 +10,7 @@
 		"gecko": {
 			"id": "dkim_verifier@pl",
 			"strict_min_version": "91.0",
-			"strict_max_version": "113.0"
+			"strict_max_version": "115.0"
 		}
 	},
 	"permissions": [