diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties index 51ea8c0d9..6b1f8eb20 100644 --- a/resources/config/defaults.properties +++ b/resources/config/defaults.properties @@ -90,4 +90,6 @@ plugin.jabberaccregwizz.NEW_ACCOUNT_DEFAULT_SERVER=jit.si net.java.sip.communicator.service.neomedia.SDES_CIPHER_SUITES=AES_CM_128_HMAC_SHA1_80,AES_CM_128_HMAC_SHA1_32 -impl.gui.PARANOIA_UI=false \ No newline at end of file +impl.gui.PARANOIA_UI=false + +impl.gui.I_DONT_CARE_THAT_MUCH_ABOUT_SECURITY=false \ No newline at end of file diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java index f99a7754d..2677eb571 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java @@ -722,9 +722,16 @@ public void securityOn(CallPeerSecurityOnEvent evt) securityPanel.securityOn(evt); + boolean isSecurityLowPriority = Boolean.parseBoolean( + GuiActivator.getResources().getSettingsString( + "impl.gui.I_DONT_CARE_THAT_MUCH_ABOUT_SECURITY")); + if (srtpControl instanceof ZrtpControl - && !((ZrtpControl) srtpControl).isSecurityVerified()) + && !((ZrtpControl) srtpControl).isSecurityVerified() + && !isSecurityLowPriority) + { setSecurityPanelVisible(true); + } this.revalidate(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java index a5e285e3d..9394550f1 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java @@ -253,9 +253,16 @@ public void securityOn(CallPeerSecurityOnEvent evt) securityPanel.securityOn(evt); + boolean isSecurityLowPriority = Boolean.parseBoolean( + GuiActivator.getResources().getSettingsString( + "impl.gui.I_DONT_CARE_THAT_MUCH_ABOUT_SECURITY")); + if (srtpControl instanceof ZrtpControl - && !((ZrtpControl) srtpControl).isSecurityVerified()) + && !((ZrtpControl) srtpControl).isSecurityVerified() + && !isSecurityLowPriority) + { setSecurityPanelVisible(true); + } callPanel.refreshContainer(); }