From 8319f99727366d3544c2b2288d369832d46b3f45 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Fri, 3 Apr 2015 13:17:54 +0200 Subject: GUI improvements for IRC account registration wizard. --- .../irc/ProtocolProviderFactoryIrcImpl.java | 5 -- .../irc/ProtocolProviderServiceIrcImpl.java | 6 +-- .../plugin/ircaccregwizz/FirstWizardPage.java | 61 ++++++++++++---------- .../ircaccregwizz/IrcAccountRegistration.java | 11 ---- .../IrcAccountRegistrationWizard.java | 6 --- 5 files changed, 36 insertions(+), 53 deletions(-) (limited to 'src/net/java/sip/communicator') diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java index e599440..db0d2c2 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java @@ -47,11 +47,6 @@ public class ProtocolProviderFactoryIrcImpl public static final String SASL_USERNAME = "SASL_USERNAME"; /** - * Property for SASL password. - */ - public static final String SASL_PASSWORD = "SASL_PASSWORD"; - - /** * Property for SASL authorization role. */ public static final String SASL_ROLE = "SASL_ROLE"; diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java index fcc1763..bb4cefa 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java @@ -269,9 +269,6 @@ public class ProtocolProviderServiceIrcImpl ProtocolProviderFactoryIrcImpl.SASL_ENABLED, false); String saslUser = accountID.getAccountPropertyString( ProtocolProviderFactoryIrcImpl.SASL_USERNAME); - // FIXME Retrieve SASL password from Jitsi secure storage! - String saslPass = accountID.getAccountPropertyString( - ProtocolProviderFactoryIrcImpl.SASL_PASSWORD); String saslRole = accountID.getAccountPropertyString( ProtocolProviderFactoryIrcImpl.SASL_ROLE); @@ -327,7 +324,8 @@ public class ProtocolProviderServiceIrcImpl if (saslEnabled) { final SASLImpl sasl = - new ClientConfigImpl.SASLImpl(saslUser, saslPass, saslRole); + new ClientConfigImpl.SASLImpl(saslUser, serverPassword, + saslRole); config.setSASL(sasl); } diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java index 7d97143..cdaf60f 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java @@ -134,8 +134,6 @@ public class FirstWizardPage private JTextField saslUserIdField = new JTextField(); - private JPasswordField saslPasswordField = new JPasswordField(); - private JTextField saslRoleField = new JTextField(); private JPanel mainPanel = new TransparentPanel(); @@ -203,6 +201,8 @@ public class FirstWizardPage this.passwordNotRequired.addActionListener(this); this.useSecureConnection.addActionListener(this); + this.saslEnabled.addActionListener(this); + this.userIDField.setText(userId); this.serverField.setText(server); this.passField.setEnabled(false); @@ -281,17 +281,22 @@ public class FirstWizardPage saslPanel.add(this.saslEnabled, BorderLayout.NORTH); TransparentPanel saslControlsPanel = new TransparentPanel(); - saslControlsPanel.setLayout(new BoxLayout(saslControlsPanel, BoxLayout.Y_AXIS)); + saslControlsPanel.setLayout(new BoxLayout(saslControlsPanel, + BoxLayout.Y_AXIS)); saslPanel.add(saslControlsPanel, BorderLayout.CENTER); - JLabel saslUserLabel = new JLabel(Resources.getString("plugin.ircaccregwizz.USERNAME") + ":"); - saslControlsPanel.add(horizontal(100, saslUserLabel, saslUserIdField)); - JLabel saslPassLabel = new JLabel(Resources.getString("service.gui.PASSWORD") + ":"); - saslControlsPanel.add(horizontal(100, saslPassLabel, saslPasswordField)); - JLabel saslRoleLabel = new JLabel(Resources.getString("plugin.ircaccregwizz.SASL_AUTHZ_ROLE") + ":"); - saslControlsPanel.add(horizontal(100, saslRoleLabel, saslRoleField)); - - // FIXME continue implementation of the sasl authentication panel + JLabel saslUserLabel = new JLabel( + Resources.getString("plugin.ircaccregwizz.SASL_USERNAME") + ":"); + saslControlsPanel.add(horizontal(100, + saslUserLabel, this.saslUserIdField)); + JLabel saslPassLabel = new JLabel( + Resources.getString("service.gui.PASSWORD") + ":"); + saslControlsPanel.add(horizontal(100, saslPassLabel, new JLabel( + Resources.getString("plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED")))); + JLabel saslRoleLabel = new JLabel( + Resources.getString("plugin.ircaccregwizz.SASL_AUTHZ_ROLE") + ":"); + saslControlsPanel + .add(horizontal(100, saslRoleLabel, this.saslRoleField)); saslPanel.setBorder(BorderFactory.createTitledBorder(Resources .getString("plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE"))); @@ -395,9 +400,9 @@ public class FirstWizardPage .isSelected()); registration.setChatRoomPresenceTaskEnabled(enableChatRoomPresenceTask .isSelected()); - registration.setSaslEnabled(this.saslEnabled.isSelected()); + registration.setSaslEnabled(!this.passwordNotRequired.isSelected() + && this.saslEnabled.isSelected()); registration.setSaslUser(this.saslUserIdField.getText()); - registration.setSaslPass(new String(saslPasswordField.getPassword())); registration.setSaslRole(this.saslRoleField.getText()); isCommitted = true; @@ -516,10 +521,6 @@ public class FirstWizardPage final String saslUser = accountID.getAccountPropertyString( IrcAccountRegistrationWizard.SASL_USERNAME, ""); - // FIXME load password from secure password storage! - final String saslPass = - accountID.getAccountPropertyString( - IrcAccountRegistrationWizard.SASL_PASSWORD, ""); final String saslRole = accountID.getAccountPropertyString( IrcAccountRegistrationWizard.SASL_ROLE, ""); @@ -553,11 +554,10 @@ public class FirstWizardPage if (noPasswordRequired != null) { - boolean isPassRequired - = !(new Boolean(noPasswordRequired).booleanValue()); + boolean isPassRequired = !Boolean.valueOf(noPasswordRequired); this.passwordNotRequired.setSelected(!isPassRequired); - + this.rememberPassBox.setEnabled(isPassRequired); passField.setEnabled(isPassRequired); } @@ -568,7 +568,6 @@ public class FirstWizardPage this.saslEnabled.setSelected(enableSaslAuthentication); this.saslUserIdField.setText(saslUser); - this.saslPasswordField.setText(saslPass); this.saslRoleField.setText(saslRole); } @@ -590,18 +589,26 @@ public class FirstWizardPage portField.setEnabled(true); } - if (passwordNotRequired.isSelected()) + boolean passwordRequired = !this.passwordNotRequired.isSelected(); + if (passwordRequired) { - passField.setText(""); - passField.setEnabled(false); - rememberPassBox.setEnabled(false); + passField.setEnabled(true); + rememberPassBox.setEnabled(true); + this.saslEnabled.setEnabled(true); } else { - passField.setEnabled(true); - rememberPassBox.setEnabled(true); + passField.setText(""); + passField.setEnabled(false); + rememberPassBox.setEnabled(false); + this.saslEnabled.setEnabled(false); } + boolean enableSaslControls = + passwordRequired && this.saslEnabled.isSelected(); + saslUserIdField.setEnabled(enableSaslControls); + saslRoleField.setEnabled(enableSaslControls); + setNextButtonAccordingToUserID(); } diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistration.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistration.java index d10f3d4..08a71fd 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistration.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistration.java @@ -25,7 +25,6 @@ public class IrcAccountRegistration private boolean secureConnection; private boolean saslEnabled; private String saslUser; - private String saslPass; private String saslRole; /** @@ -267,16 +266,6 @@ public class IrcAccountRegistration this.saslUser = user; } - public String getSaslPass() - { - return this.saslPass; - } - - public void setSaslPass(final String pass) - { - this.saslPass = pass; - } - public String getSaslRole() { return this.saslRole; diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java index 9c2f173..7f26e69 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java @@ -58,11 +58,6 @@ public class IrcAccountRegistrationWizard public static final String SASL_USERNAME = "SASL_USERNAME"; /** - * Property name for SASL password. - */ - public static final String SASL_PASSWORD = "SASL_PASSWORD"; - - /** * Property for SASL authorization role. */ public static final String SASL_ROLE = "SASL_ROLE"; @@ -318,7 +313,6 @@ public class IrcAccountRegistrationWizard accountProperties.put(SASL_ENABLED, Boolean.toString(registration.isSaslEnabled())); accountProperties.put(SASL_USERNAME, registration.getSaslUser()); - accountProperties.put(SASL_PASSWORD, registration.getSaslPass()); accountProperties.put(SASL_ROLE, registration.getSaslRole()); if (isModification()) -- cgit v1.1