diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java index 36ac2129d..713b673fd 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SecurityPanel.java @@ -78,6 +78,10 @@ private static class CipherTableModel extends AbstractTableModel public void loadData(String ciphers) { data.clear(); + + if(defaultCiphers == null) + return; + if(ciphers == null) ciphers = defaultCiphers; //TODO the available ciphers should come from SDesControlImpl @@ -157,7 +161,8 @@ String getEnabledCiphers() if(sb.length() == 0) return null; String result = sb.substring(0, sb.length()-1); - return defaultCiphers.equals(result) ? null : result; + return (defaultCiphers == null + || defaultCiphers.equals(result)) ? null : result; } }