self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

Desktop: Resolves #6338: Improve E2EE usability when accidentally creating multiple keys (#6399)

Browse Source
This commit is contained in:
Laurent
2022-04-13 12:18:38 +01:00
committed by GitHub
parent 376019b540
commit e5313a9719
10 changed files with 155 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx
View File

@ -137,7 +137,7 @@ const EncryptionConfigScreen = (props: Props) => {
return (
<td style={theme.textStyle}>
<input type="password" style={passwordStyle} value={password} onChange={event => onInputPasswordChange(mk, event.target.value)} />{' '}
<button style={theme.buttonStyle} onClick={() => onSavePasswordClick(mk, props.passwords)}>
<button style={theme.buttonStyle} onClick={() => onSavePasswordClick(mk, { ...props.passwords, ...inputPasswords })}>
{_('Save')}
</button>
</td>
@ -268,7 +268,7 @@ const EncryptionConfigScreen = (props: Props) => {
const buttonTitle = CommandService.instance().label('openMasterPasswordDialog');
const needPasswordMessage = !needMasterPassword ? null : (
<p className="needpassword">{_('Your master password is needed to decrypt some of your data.')}<br/>{_('Please click on "%s" to proceed', buttonTitle)}</p>
<p className="needpassword">{_('Your password is needed to decrypt some of your data.')}<br/>{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}</p>
);
return (