From 8e2f800c181942dad448fb8026f5acea2230d8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Wed, 20 Mar 2024 17:15:58 +0100 Subject: [PATCH] Restore compatibility with Firefox before 124 --- .../profile/chrome/pwa/content/browser.jsm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/native/userchrome/profile/chrome/pwa/content/browser.jsm b/native/userchrome/profile/chrome/pwa/content/browser.jsm index 0f6bd851..45506cb4 100644 --- a/native/userchrome/profile/chrome/pwa/content/browser.jsm +++ b/native/userchrome/profile/chrome/pwa/content/browser.jsm @@ -1989,13 +1989,19 @@ class PwaBrowser { } disableOnboarding () { - const { OnboardingMessageProvider } = ChromeUtils.import('resource:///modules/asrouter/OnboardingMessageProvider.jsm'); + // Disable default browser prompt + const { BrowserGlue } = ChromeUtils.import('resource:///modules/BrowserGlue.jsm'); + BrowserGlue.prototype._maybeShowDefaultBrowserPrompt = async () => null; + + // Handle both post-124 and pre-124 paths + let OnboardingMessageProvider = undefined; + try { OnboardingMessageProvider = ChromeUtils.import('resource:///modules/asrouter/OnboardingMessageProvider.jsm').OnboardingMessageProvider } + catch { OnboardingMessageProvider = ChromeUtils.import('resource://activity-stream/lib/OnboardingMessageProvider.jsm').OnboardingMessageProvider } + + // Disable onboarding messages OnboardingMessageProvider.getMessages = async () => []; OnboardingMessageProvider.getUntranslatedMessages = async () => []; OnboardingMessageProvider.getUntranslatedMessages = async () => null; - - const { BrowserGlue } = ChromeUtils.import('resource:///modules/BrowserGlue.jsm'); - BrowserGlue.prototype._maybeShowDefaultBrowserPrompt = async () => null; } //////////////////////////////