Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1947/head^2
Laurent Cozic 2019-10-02 19:03:59 +01:00
parent 309835f2fe 4259d900f4
commit cdcc3902c5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CliClient/app/command-e2ee.js
View File

@ -50,7 +50,15 @@ class Command extends BaseCommand {
this.stdout(_('Operation cancelled')); this.stdout(_('Operation cancelled'));
return; return;
} }
const password2 = await this.prompt(_('Confirm master password:'), { type: 'string', secure: true });
if (!password2) {
this.stdout(_('Operation cancelled'));
return;
}
if (password !== password2) {
this.stdout(_('Passwords did not match!'));
return;
}
await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password); await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password);
return; return;
} }

2
ReactNativeClient/lib/models/Setting.js
View File

@ -218,8 +218,8 @@ class Setting extends BaseModel {
let output = {}; let output = {};
output[Setting.THEME_LIGHT] = _('Light'); output[Setting.THEME_LIGHT] = _('Light');
output[Setting.THEME_DARK] = _('Dark'); output[Setting.THEME_DARK] = _('Dark');
output[Setting.THEME_DRACULA] = _('Dracula');
if (platform !== 'mobile') { if (platform !== 'mobile') {
output[Setting.THEME_DRACULA] = _('Dracula');
output[Setting.THEME_SOLARIZED_LIGHT] = _('Solarised Light'); output[Setting.THEME_SOLARIZED_LIGHT] = _('Solarised Light');
output[Setting.THEME_SOLARIZED_DARK] = _('Solarised Dark'); output[Setting.THEME_SOLARIZED_DARK] = _('Solarised Dark');
} }