mirror/mobile
1
0
Fork 0
mirror of https://github.com/standardnotes/mobile.git synced 2026-04-19 13:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.5.3'

Browse Source
This commit is contained in:
Radek Czemerys
2020-11-05 19:22:50 +01:00
parent b49ed46a7c 68b33580d9
commit e4792ab70f
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -55,7 +55,7 @@
"react-navigation-header-buttons": "^6.0.0",
"sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8",
"sncrypto": "standardnotes/sncrypto#5f8cd36",
"snjs": "standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1",
"snjs": "standardnotes/snjs#d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b",
"standard-notes-rn": "standardnotes/standard-notes-rn#996b016",
"styled-components": "^5.2.1"
},

11
src/lib/installation_service.ts
View File

@@ -38,7 +38,16 @@ export class InstallationService extends ApplicationService {
FIRST_RUN_KEY,
StorageValueModes.Nonwrapped
);
const firstRunKeyMissing = isNullOrUndefined(firstRunKey);
let firstRunKeyMissing = isNullOrUndefined(firstRunKey);
/*
* Because of migration failure first run key might not be in non wrapped storage
*/
if (firstRunKeyMissing) {
const fallbackFirstRunValue = await this.application?.deviceInterface?.getRawStorageValue(
FIRST_RUN_KEY
);
firstRunKeyMissing = isNullOrUndefined(fallbackFirstRunValue);
}
return !hasNormalKeys && hasKeychainValue && firstRunKeyMissing;
}

4
yarn.lock
View File

@@ -7988,9 +7988,9 @@ sncrypto@standardnotes/sncrypto#5f8cd36:
version "1.2.0"
resolved "https://codeload.github.com/standardnotes/sncrypto/tar.gz/5f8cd369773cec7f342c23ecaa659d932b35cd31"
snjs@standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1:
snjs@standardnotes/snjs#d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b:
version "1.0.5"
resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/b07f37232029056699e7eae9af0820ca7cf536d1"
resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b"
source-map-resolve@^0.5.0:
version "0.5.3"