skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix file import & sane format migration.

Browse Source
This commit is contained in:
Maarten Billemont
2018-10-13 16:44:37 -04:00
parent 46fe919476
commit ff17a1d637
8 changed files with 131 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
View File

@@ -3,7 +3,7 @@ package com.lyndir.masterpassword.gui.view;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
import com.google.common.base.*;
import com.google.common.collect.*;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.UnsignedInteger;
import com.google.common.util.concurrent.ListenableFuture;
import com.lyndir.lhunath.opal.system.logging.Logger;
@@ -407,6 +407,9 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
Res.job( () -> {
try {
user.authenticate( masterPassword );
if (user instanceof MPFileUser)
((MPFileUser) user).migrateTo( MPMarshalFormat.DEFAULT );
}
catch (final MPIncorrectMasterPasswordException e) {
logger.wrn( e, "During user authentication for: %s", user );