Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-30 13:03:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix error in firefox

Browse Source
This commit is contained in:
Hinton 2020-10-21 19:23:27 +02:00
parent 251d0fdde3
commit 222665dd9d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/background/nativeMessaging.background.ts
View File

@ -67,9 +67,15 @@ export class NativeMessagingBackground {
} }
}); });
this.port.onDisconnect.addListener(() => { this.port.onDisconnect.addListener((p: any) => {
const error = BrowserApi.runtimeLastError().message; let error;
if (error === 'Specified native messaging host not found.' || error === 'Access to the specified native messaging host is forbidden.') { if (BrowserApi.isWebExtensionsApi) {
error = p.error.message;
} else {
error = chrome.runtime.lastError.message;
}
if (error === 'Specified native messaging host not found.' || error === 'Access to the specified native messaging host is forbidden.' || error === 'An unexpected error occurred') {
this.messagingService.send('showDialog', { this.messagingService.send('showDialog', {
text: this.i18nService.t('desktopIntegrationDisabledDesc'), text: this.i18nService.t('desktopIntegrationDisabledDesc'),
title: this.i18nService.t('desktopIntegrationDisabledTitle'), title: this.i18nService.t('desktopIntegrationDisabledTitle'),

8
src/browser/browserApi.ts
View File

@ -229,12 +229,4 @@ export class BrowserApi {
return chrome.runtime.connectNative(application); return chrome.runtime.connectNative(application);
} }
} }
static runtimeLastError(): browser.runtime._LastError | chrome.runtime.LastError {
if (BrowserApi.isWebExtensionsApi) {
return browser.runtime.lastError;
} else if (BrowserApi.isChromeApi) {
return chrome.runtime.lastError;
}
}
} }