self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

All: Fixed handling of unloaded master key

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-22 18:50:27 +00:00
parent 6683da804b
commit 70b03971f6
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/services/DecryptionWorker.js
View File

@@ -62,10 +62,10 @@ class DecryptionWorker {
try {
await ItemClass.decrypt(item);
} catch (error) {
if (error.code === 'missingMasterKey') {
if (error.code === 'masterKeyNotLoaded') {
excludedIds.push(item.id);
this.dispatch({
type: 'MASTERKEY_ADD_MISSING',
type: 'MASTERKEY_ADD_NOT_LOADED',
id: error.masterKeyId,
});
continue;

2
ReactNativeClient/lib/services/EncryptionService.js
View File

@@ -136,7 +136,7 @@ class EncryptionService {
loadedMasterKey(id) {
if (!this.loadedMasterKeys_[id]) {
const error = new Error('Master key is not loaded: ' + id);
error.code = 'missingMasterKey';
error.code = 'masterKeyNotLoaded';
error.masterKeyId = id;
throw error;
}