allow static lock timeout definition

bitwarden · Jun 9, 2018 · cd3c2dd · cd3c2dd
1 parent 7b05416
commit cd3c2dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/abstractions/platformUtils.service.ts b/src/abstractions/platformUtils.service.ts
@@ -15,6 +15,7 @@ export abstract class PlatformUtilsService {
     analyticsId: () => string;
     getDomain: (uriString: string) => string;
     isViewOpen: () => boolean;
+    lockTimeout: () => number;
     launchUri: (uri: string, options?: any) => void;
     saveFile: (win: Window, blobData: any, blobOptions: any, fileName: string) => void;
     getApplicationVersion: () => string;

diff --git a/src/electron/services/electronPlatformUtils.service.ts b/src/electron/services/electronPlatformUtils.service.ts
@@ -103,6 +103,10 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
         return false;
     }
 
+    lockTimeout(): number {
+        return null;
+    }
+
     launchUri(uri: string, options?: any): void {
         shell.openExternal(uri);
     }

diff --git a/src/services/lock.service.ts b/src/services/lock.service.ts
@@ -42,7 +42,10 @@ export class LockService implements LockServiceAbstraction {
             return;
         }
 
-        const lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
+        let lockOption = this.platformUtilsService.lockTimeout();
+        if (lockOption == null) {
+            lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
+        }
         if (lockOption == null || lockOption < 0) {
             return;
         }