From fe0f4120baffd0d9106c896a6a5b1e5e2fee0ac7 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Wed, 20 Oct 2021 22:41:33 +0200
Subject: [PATCH] Remove empty catch blocks and remove allow-empty-catch tslint
 rule (#393)

---
 jslib     | 2 +-
 src/bw.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jslib b/jslib
index e3ab324d59..f09fb69882 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e3ab324d59ee04870007e5078901a22e4dd81440
+Subproject commit f09fb69882525b3be7b2e257e7723eeb79b343d1
diff --git a/src/bw.ts b/src/bw.ts
index d8924a8f34..807e8b9597 100644
--- a/src/bw.ts
+++ b/src/bw.ts
@@ -127,13 +127,13 @@ export class Main {
         this.settingsService = new SettingsService(this.userService, this.storageService);
         this.fileUploadService = new FileUploadService(this.logService, this.apiService);
         this.cipherService = new CipherService(this.cryptoService, this.userService, this.settingsService,
-            this.apiService, this.fileUploadService, this.storageService, this.i18nService, null);
+            this.apiService, this.fileUploadService, this.storageService, this.i18nService, null, this.logService);
         this.folderService = new FolderService(this.cryptoService, this.userService, this.apiService,
             this.storageService, this.i18nService, this.cipherService);
         this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService,
             this.i18nService);
         this.searchService = new SearchService(this.cipherService, this.logService, this.i18nService);
-        this.policyService = new PolicyService(this.userService, this.storageService);
+        this.policyService = new PolicyService(this.userService, this.storageService, this.apiService);
         this.sendService = new SendService(this.cryptoService, this.userService, this.apiService, this.fileUploadService,
             this.storageService, this.i18nService, this.cryptoFunctionService);
         this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService,
@@ -143,10 +143,10 @@ export class Main {
         this.syncService = new SyncService(this.userService, this.apiService, this.settingsService,
             this.folderService, this.cipherService, this.cryptoService, this.collectionService,
             this.storageService, this.messagingService, this.policyService, this.sendService,
-            async (expired: boolean) => await this.logout());
+            this.logService, async (expired: boolean) => await this.logout());
         this.passwordGenerationService = new PasswordGenerationService(this.cryptoService, this.storageService,
             this.policyService);
-        this.totpService = new TotpService(this.storageService, this.cryptoFunctionService);
+        this.totpService = new TotpService(this.storageService, this.cryptoFunctionService, this.logService);
         this.importService = new ImportService(this.cipherService, this.folderService, this.apiService,
             this.i18nService, this.collectionService, this.platformUtilsService, this.cryptoService);
         this.exportService = new ExportService(this.folderService, this.cipherService, this.apiService,