From fc1a73c9f2ef2c18f05dfebb5cf80ce84520d118 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 19 Mar 2019 15:44:48 -0400
Subject: [PATCH] check if authed before trying to lock

---
 src/services/lock.service.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/services/lock.service.ts b/src/services/lock.service.ts
index 230fd33d108..0c091d9fc07 100644
--- a/src/services/lock.service.ts
+++ b/src/services/lock.service.ts
@@ -9,6 +9,7 @@ import { MessagingService } from '../abstractions/messaging.service';
 import { PlatformUtilsService } from '../abstractions/platformUtils.service';
 import { SearchService } from '../abstractions/search.service';
 import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
 
 export class LockService implements LockServiceAbstraction {
     pinLocked = false;
@@ -19,7 +20,7 @@ export class LockService implements LockServiceAbstraction {
         private collectionService: CollectionService, private cryptoService: CryptoService,
         private platformUtilsService: PlatformUtilsService, private storageService: StorageService,
         private messagingService: MessagingService, private searchService: SearchService,
-        private lockedCallback: () => Promise<void> = null) {
+        private userService: UserService, private lockedCallback: () => Promise<void> = null) {
     }
 
     init(checkOnInterval: boolean) {
@@ -48,6 +49,11 @@ export class LockService implements LockServiceAbstraction {
             return;
         }
 
+        const authed = await this.userService.isAuthenticated();
+        if (!authed) {
+            return;
+        }
+
         if (await this.isLocked()) {
             return;
         }
@@ -74,6 +80,11 @@ export class LockService implements LockServiceAbstraction {
     }
 
     async lock(allowSoftLock = false): Promise<void> {
+        const authed = await this.userService.isAuthenticated();
+        if (!authed) {
+            return;
+        }
+
         if (allowSoftLock) {
             const pinSet = await this.isPinLockSet();
             if (pinSet[0]) {