self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-12 22:57:38 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic
2018-02-15 18:33:21 +00:00
parent 3a4bbd571e feccc6150e
commit a6e6b49a9d
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,8 +84,9 @@ class DecryptionWorker {
try {
await ItemClass.decrypt(item);
} catch (error) {
excludedIds.push(item.id);
if (error.code === 'masterKeyNotLoaded' && options.materKeyNotLoadedHandler === 'dispatch') {
excludedIds.push(item.id);
if (notLoadedMasterKeyDisptaches.indexOf(error.masterKeyId) < 0) {
this.dispatch({
type: 'MASTERKEY_ADD_NOT_LOADED',