From 0e2432d6f40f38c86921c8d0b1db220305c884d0 Mon Sep 17 00:00:00 2001 From: Hinton Date: Mon, 23 Nov 2020 14:27:36 +0100 Subject: [PATCH] Review comments --- src/background/main.background.ts | 2 +- src/background/nativeMessaging.background.ts | 14 ++++++++------ src/services/browserPlatformUtils.service.ts | 1 - 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/background/main.background.ts b/src/background/main.background.ts index 47b7d5e76b..fdf2ab81f5 100644 --- a/src/background/main.background.ts +++ b/src/background/main.background.ts @@ -71,6 +71,7 @@ import { SafariApp } from '../browser/safariApp'; import CommandsBackground from './commands.background'; import ContextMenusBackground from './contextMenus.background'; import IdleBackground from './idle.background'; +import { NativeMessagingBackground } from './nativeMessaging.background'; import RuntimeBackground from './runtime.background'; import TabsBackground from './tabs.background'; import WebRequestBackground from './webRequest.background'; @@ -84,7 +85,6 @@ import I18nService from '../services/i18n.service'; import { PopupUtilsService } from '../popup/services/popup-utils.service'; import { AutofillService as AutofillServiceAbstraction } from '../services/abstractions/autofill.service'; -import { NativeMessagingBackground } from './nativeMessaging.background'; export default class MainBackground { messagingService: MessagingServiceAbstraction; diff --git a/src/background/nativeMessaging.background.ts b/src/background/nativeMessaging.background.ts index 6e572d93e0..88397c0538 100644 --- a/src/background/nativeMessaging.background.ts +++ b/src/background/nativeMessaging.background.ts @@ -1,15 +1,17 @@ -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { ConstantsService } from 'jslib/services/constants.service'; import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; +import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { I18nService } from 'jslib/abstractions/i18n.service'; +import { MessagingService } from 'jslib/abstractions/messaging.service'; import { StorageService } from 'jslib/abstractions/storage.service'; +import { UserService } from 'jslib/abstractions/user.service'; +import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; + import { Utils } from 'jslib/misc/utils'; import { SymmetricCryptoKey } from 'jslib/models/domain'; -import { ConstantsService } from 'jslib/services'; + import { BrowserApi } from '../browser/browserApi'; import RuntimeBackground from './runtime.background'; -import { UserService } from 'jslib/abstractions/user.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; const MessageValidTimeout = 10 * 1000; const EncryptionAlgorithm = 'sha1'; diff --git a/src/services/browserPlatformUtils.service.ts b/src/services/browserPlatformUtils.service.ts index dea8ccc7c9..b9946937f4 100644 --- a/src/services/browserPlatformUtils.service.ts +++ b/src/services/browserPlatformUtils.service.ts @@ -1,6 +1,5 @@ import { BrowserApi } from '../browser/browserApi'; import { SafariApp } from '../browser/safariApp'; -import { NativeMessagingBackground } from '../background/nativeMessaging.background'; import { DeviceType } from 'jslib/enums/deviceType';