diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2012-04-20 09:26:24 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2012-04-20 09:26:24 +0000 |
| commit | b003f7ffd6bbd920305adce05afa8e470531182b (patch) | |
| tree | 92856f7e8a6aa0ef9201ad8ca92fe5192c3cceae /src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java | |
| parent | 498f2bb229b837c419fe7361712146efcff45e7a (diff) | |
| download | jitsi-b003f7ffd6bbd920305adce05afa8e470531182b.zip jitsi-b003f7ffd6bbd920305adce05afa8e470531182b.tar.gz jitsi-b003f7ffd6bbd920305adce05afa8e470531182b.tar.bz2 | |
Makes appearance of zrtp confirmation panel configurable.
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java | 9 |
1 files changed, 8 insertions, 1 deletions
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 f99a775..2677eb5 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 class OneToOneCallPeerPanel 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(); } |