fix: check if keychain is object before checking keys

standardnotes · Mar 5, 2021 · c3671d2 · c3671d2
1 parent e09189c
commit c3671d2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lib/installation_service.ts b/src/lib/installation_service.ts
@@ -32,8 +32,10 @@ export class InstallationService extends ApplicationService {
     const hasNormalKeys =
       this.application?.hasAccount() || this.application?.hasPasscode();
     const keychainKey = await this.application?.deviceInterface?.getRawKeychainValue();
-    const hasKeychainValue =
-      !isNullOrUndefined(keychainKey) && Object.keys(keychainKey).length > 0;
+    const hasKeychainValue = !(
+      isNullOrUndefined(keychainKey) ||
+      (typeof keychainKey === 'object' && Object.keys(keychainKey).length === 0)
+    );
 
     let firstRunKey = await this.application?.getValue(
       FIRST_RUN_KEY,