summaryrefslogtreecommitdiff
path: root/ext/js/extension
diff options
context:
space:
mode:
authorpraschke <stel@comfy.monster>2023-10-29 22:17:08 +0000
committerpraschke <stel@comfy.monster>2023-10-29 23:22:22 +0000
commitbbefd8a07ba71d7fe5e9c707ddb06e99bfd2a502 (patch)
tree528d984e6f4b3f39e4502a6cf125f8fc30b86c6c /ext/js/extension
parente61a69fb9ed8ad1dc94b4695d9b9052f4a533a52 (diff)
nativeMessaging can always be optional
this is the only blocker to Firefox for Android.
Diffstat (limited to 'ext/js/extension')
-rw-r--r--ext/js/extension/environment.js16
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/js/extension/environment.js b/ext/js/extension/environment.js
index ec1e8612..ad5a19ae 100644
--- a/ext/js/extension/environment.js
+++ b/ext/js/extension/environment.js
@@ -31,8 +31,9 @@ class Environment {
}
async _loadEnvironmentInfo() {
- const browser = await this._getBrowser();
const os = await this._getOperatingSystem();
+ const browser = await this._getBrowser(os);
+
return {
browser,
platform: {os}
@@ -64,7 +65,7 @@ class Environment {
});
}
- async _getBrowser() {
+ async _getBrowser(os) {
try {
if (chrome.runtime.getURL('/').startsWith('ms-browser-extension://')) {
return 'edge-legacy';
@@ -76,17 +77,12 @@ class Environment {
// NOP
}
if (typeof browser !== 'undefined') {
- try {
- const info = await browser.runtime.getBrowserInfo();
- if (info.name === 'Fennec') {
- return 'firefox-mobile';
- }
- } catch (e) {
- // NOP
- }
if (this._isSafari()) {
return 'safari';
}
+ if (os === 'android') {
+ return 'firefox-mobile';
+ }
return 'firefox';
} else {
return 'chrome';