diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-03-30 10:50:27 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-03-30 10:50:27 +0000 |
| commit | d5795b3114646d5c6b71338060247c9e78af2b7a (patch) | |
| tree | 4c4bef77c70706c48e3e0a69a14895c376384ed6 /src/net/java/sip/communicator/plugin/sipaccregwizz | |
| parent | cc95e558e420c55f80ea65b818c360e40dfa2ac3 (diff) | |
| download | jitsi-d5795b3114646d5c6b71338060247c9e78af2b7a.zip jitsi-d5795b3114646d5c6b71338060247c9e78af2b7a.tar.gz jitsi-d5795b3114646d5c6b71338060247c9e78af2b7a.tar.bz2 | |
Fixes a ConcurrentModificationException in SRTCPTransformer.
Diffstat (limited to 'src/net/java/sip/communicator/plugin/sipaccregwizz')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java index 2f7c904..079788c 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java @@ -29,7 +29,7 @@ public class SecurityPanel */
private static final long serialVersionUID = 0L;
- private SIPAccountRegistrationForm regform;
+ private final SIPAccountRegistrationForm regform;
private JPanel pnlAdvancedSettings;
private JCheckBox enableDefaultEncryption;
@@ -347,30 +347,36 @@ public class SecurityPanel */
void loadAccount(AccountID accountID)
{
- enableDefaultEncryption.setSelected(accountID
- .getAccountPropertyBoolean(
- ProtocolProviderFactory.DEFAULT_ENCRYPTION, true));
- enableSipZrtpAttribute.setSelected(accountID.getAccountPropertyBoolean(
- ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE, true));
- cboSavpOption.setSelectedIndex(accountID.getAccountPropertyInt(
- ProtocolProviderFactory.SAVP_OPTION,
- ProtocolProviderFactory.SAVP_OFF));
- enableSDesAttribute.setSelected(accountID.getAccountPropertyBoolean(
- ProtocolProviderFactory.SDES_ENABLED, false));
- cipherModel.loadData(accountID.getAccountPropertyString(
- ProtocolProviderFactory.SDES_CIPHER_SUITES));
+ enableDefaultEncryption.setSelected(
+ accountID.getAccountPropertyBoolean(
+ ProtocolProviderFactory.DEFAULT_ENCRYPTION,
+ true));
+ enableSipZrtpAttribute.setSelected(
+ accountID.getAccountPropertyBoolean(
+ ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE,
+ true));
+ cboSavpOption.setSelectedIndex(
+ accountID.getAccountPropertyInt(
+ ProtocolProviderFactory.SAVP_OPTION,
+ ProtocolProviderFactory.SAVP_OFF));
+ enableSDesAttribute.setSelected(
+ accountID.getAccountPropertyBoolean(
+ ProtocolProviderFactory.SDES_ENABLED,
+ false));
+ cipherModel.loadData(
+ accountID.getAccountPropertyString(
+ ProtocolProviderFactory.SDES_CIPHER_SUITES));
loadStates();
}
public void actionPerformed(ActionEvent e)
{
- if(e.getSource() == enableDefaultEncryption
- || e.getSource() == enableSDesAttribute)
+ if((e.getSource() == enableDefaultEncryption)
+ || (e.getSource() == enableSDesAttribute))
{
loadStates();
}
-
- if(e.getSource() == cmdExpandAdvancedSettings)
+ else if(e.getSource() == cmdExpandAdvancedSettings)
{
pnlAdvancedSettings.setVisible(!pnlAdvancedSettings.isVisible());
}
|