Saving custom passwords and logins.

2018-08-19 16:11:43 -04:00
parent 40fdc8d248
commit 6f0d768e69
9 changed files with 96 additions and 24 deletions
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java
@@ -160,6 +160,10 @@ public abstract class Res {
            return icon( "media/icon_settings.png" );
        }

+        public Icon edit() {
+            return icon( "media/icon_edit.png" );
+        }
+
        public Icon avatar(final int index) {
            return icon( strf( "media/avatar-%d.png", index % avatars() ) );
        }
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
@@ -470,6 +470,8 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
                                                                   "Show site settings." );
        private final JButton questionsButton = Components.button( Res.icons().question(), event -> showSiteQuestions(),
                                                                   "Show site recovery questions." );
+        private final JButton editButton      = Components.button( Res.icons().edit(), event -> showEditSite(),
+                                                                   "Set/save personal password/login." );
        private final JButton deleteButton    = Components.button( Res.icons().delete(), event -> deleteSite(),
                                                                   "Delete the site from the user." );

@@ -499,6 +501,7 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,

            siteToolbar.add( settingsButton );
            siteToolbar.add( questionsButton );
+            siteToolbar.add( editButton );
            siteToolbar.add( deleteButton );
            settingsButton.setEnabled( false );
            questionsButton.setEnabled( false );
@@ -587,12 +590,14 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
                            Components.strut() );

            components.add( Components.label( "Password Type:" ),
-                            Components.comboBox( MPResultType.values(), MPResultType::getLongName,
+                            Components.comboBox( MPResultType.values(), type -> getTypeDescription(
+                                    type, user.getDefaultType(), user.getAlgorithm().mpw_default_result_type() ),
                                                 site.getResultType(), site::setResultType ),
                            Components.strut() );

            components.add( Components.label( "Login Type:" ),
-                            Components.comboBox( MPResultType.values(), MPResultType::getLongName,
+                            Components.comboBox( MPResultType.values(), type -> getTypeDescription(
+                                    type, user.getAlgorithm().mpw_default_login_type() ),
                                                 site.getLoginType(), site::setLoginType ),
                            Components.strut() );

@@ -606,6 +611,15 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
                    BoxLayout.PAGE_AXIS, components.build().toArray( new Component[0] ) ) ) );
        }

+        private String getTypeDescription(final MPResultType type, final MPResultType... defaults) {
+            boolean isDefault = false;
+            for (final MPResultType d : defaults)
+                if (isDefault = type == d)
+                    break;
+
+            return strf( "<html>%s%s%s, %s", isDefault? "<b>": "", type.getLongName(), isDefault? "</b>": "", type.getDescription() );
+        }
+
        public void showSiteQuestions() {
            MPSite<?> site = sitesModel.getSelectedItem();
            if (site == null)
@@ -651,6 +665,51 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
            } );
        }

+        public void showEditSite() {
+            MPSite<?> site = sitesModel.getSelectedItem();
+            if (site == null)
+                return;
+
+            try {
+                JTextField passwordField = Components.textField( site.getResult(), null );
+                JTextField loginField    = Components.textField( site.getLogin(), null );
+                passwordField.setEditable( site.getResultType().getTypeClass() == MPResultTypeClass.Stateful );
+                loginField.setEditable( site.getLoginType().getTypeClass() == MPResultTypeClass.Stateful );
+
+                if (JOptionPane.OK_OPTION == Components.showDialog( this, site.getSiteName(), new JOptionPane(
+                        Components.panel(
+                                BoxLayout.PAGE_AXIS,
+                                Components.label( strf( "<html>Site Login (currently set to: <b>%s</b>):",
+                                                        getTypeDescription( site.getLoginType() ) ) ),
+                                loginField,
+                                Components.strut(),
+                                Components.label( strf( "<html>Site Password (currently set to: <b>%s</b>):",
+                                                        getTypeDescription( site.getResultType() ) ) ),
+                                passwordField,
+                                Components.strut(),
+                                Components.label( "<html>To save a personal value in these fields,\n" +
+                                                  "change the type to <b>Saved</b> in the site's settings." ) ),
+                        JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION ) {
+                    @Override
+                    public void selectInitialValue() {
+                        passwordField.requestFocusInWindow();
+                    }
+                } )) {
+                    if (site instanceof MPFileSite) {
+                        MPFileSite fileSite = (MPFileSite) site;
+
+                        if (site.getResultType().getTypeClass() == MPResultTypeClass.Stateful)
+                            fileSite.setSitePassword( site.getResultType(), passwordField.getText() );
+                        if (site.getLoginType().getTypeClass() == MPResultTypeClass.Stateful)
+                            fileSite.setLoginName( site.getLoginType(), loginField.getText() );
+                    }
+                }
+            }
+            catch (final MPKeyUnavailableException | MPAlgorithmException e) {
+                logger.err( e, "While computing site edit results." );
+            }
+        }
+
        public void deleteSite() {
            MPSite<?> site = sitesModel.getSelectedItem();
            if (site == null)
--- a/platform-independent/java/gui/src/main/resources/media/icon_edit.png
+++ b/platform-independent/java/gui/src/main/resources/media/icon_edit.png
--- a/platform-independent/java/gui/src/main/resources/media/icon_edit@2x.png
+++ b/platform-independent/java/gui/src/main/resources/media/icon_edit@2x.png