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.

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);
         }