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

All: Handle tag encryption and started CLI and Electron encryption front-end

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-14 00:23:32 +00:00
parent 2ffa5419e2
commit 1008b1835b
14 changed files with 93 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/BaseApplication.js
View File

@@ -26,6 +26,7 @@ const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
const SyncTargetOneDriveDev = require('lib/SyncTargetOneDriveDev.js');
const EncryptionService = require('lib/services/EncryptionService');
SyncTargetRegistry.addClass(SyncTargetFilesystem);
SyncTargetRegistry.addClass(SyncTargetOneDrive);
@@ -392,6 +393,9 @@ class BaseApplication {
setLocale(Setting.value('locale'));
}
BaseItem.encryptionService_ = EncryptionService.instance();
await EncryptionService.instance().loadMasterKeysFromSettings();
let currentFolderId = Setting.value('activeFolderId');
let currentFolder = null;
if (currentFolderId) currentFolder = await Folder.load(currentFolderId);