self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

CLI: Fixed regression which was preventing decryption on newly created profiles

Browse Source
This commit is contained in:
Laurent Cozic 2019-06-10 08:55:36 +01:00
parent 7c6c7f34ba
commit 62c48b9a46
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CliClient/run.sh
View File

@ -3,5 +3,4 @@ set -e
CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
# bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/.config/joplin --stack-trace-enabled --log-level debug "$@"
# bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/.config/joplin --stack-trace-enabled --log-level debug --env dev "$@"

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

@ -106,16 +106,25 @@ class DecryptionWorker {
return;
}
// Note: the logic below is an optimisation to avoid going through the loop if no master key exists
// or if none is loaded. It means this logic needs to be duplicate a bit what's in the loop, like the
// "throw" and "dispatch" logic.
const loadedMasterKeyCount = await this.encryptionService().loadedMasterKeysCount();
if (!loadedMasterKeyCount) {
this.logger().info('DecryptionWorker: cannot start because no master key is currently loaded.');
const ids = await MasterKey.allIds();
if (ids.length) {
this.dispatch({
type: 'MASTERKEY_SET_NOT_LOADED',
ids: ids,
});
if (options.masterKeyNotLoadedHandler === 'throw') {
// By trying to load the master key here, we throw the "masterKeyNotLoaded" error
// which the caller needs.
await this.encryptionService().loadedMasterKey(ids[0]);
} else {
this.dispatch({
type: 'MASTERKEY_SET_NOT_LOADED',
ids: ids,
});
}
}
return;
}