diff options
author | Werner Dittmann <wernerd@java.net> | 2012-04-23 07:41:38 +0000 |
---|---|---|
committer | Werner Dittmann <wernerd@java.net> | 2012-04-23 07:41:38 +0000 |
commit | 4f949485c76f8b87b0f5dce78ce81bc6b5811cb9 (patch) | |
tree | 2ea4e7c5b2479b285b44a2fbe12c8c3e233154e2 /src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java | |
parent | 88ee447fe5632d8c3b01fa2c9ec49c4d434b5b63 (diff) | |
download | jitsi-4f949485c76f8b87b0f5dce78ce81bc6b5811cb9.zip jitsi-4f949485c76f8b87b0f5dce78ce81bc6b5811cb9.tar.gz jitsi-4f949485c76f8b87b0f5dce78ce81bc6b5811cb9.tar.bz2 |
Enhance ZID name feature to store AOR/JID.
Storing AOR/JID enables Jitsi to perform an automatic check if the
stored AOR/JID associated with a ZID matches the values of the
current call AOR/JID. In case of a mismatch Jitsi displays a popup
window to inform the user.
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 | 10 |
1 files changed, 7 insertions, 3 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 2677eb5..183ae3e 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 @@ -726,10 +726,14 @@ public class OneToOneCallPeerPanel GuiActivator.getResources().getSettingsString( "impl.gui.I_DONT_CARE_THAT_MUCH_ABOUT_SECURITY")); + // Display ZRTP panel in case SAS was not verified or a AOR mismtach + // was detected during creation of ZrtpSecurityPanel. + // Don't show panel if user does not care about security at all. if (srtpControl instanceof ZrtpControl - && !((ZrtpControl) srtpControl).isSecurityVerified() - && !isSecurityLowPriority) - { + && !isSecurityLowPriority + && (!((ZrtpControl) srtpControl).isSecurityVerified() + || ((ZrtpSecurityPanel) securityPanel).isZidAorMismatch())) + setSecurityPanelVisible(true); } |