From aba8fd93971d2d90de2e06950df44d9dee1f71d8 Mon Sep 17 00:00:00 2001
From: Werner Dittmann <wernerd@java.net>
Date: Mon, 16 Feb 2009 17:36:02 +0000
Subject: [PATCH] Fix reporting of non-DH (multi-stream) security events.

---
 .../transform/zrtp/SecurityEventManager.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/media/transform/zrtp/SecurityEventManager.java b/src/net/java/sip/communicator/impl/media/transform/zrtp/SecurityEventManager.java
index 935573e83..8c2120289 100644
--- a/src/net/java/sip/communicator/impl/media/transform/zrtp/SecurityEventManager.java
+++ b/src/net/java/sip/communicator/impl/media/transform/zrtp/SecurityEventManager.java
@@ -170,7 +170,8 @@ public void showMessage(ZrtpCodes.MessageSeverity sev,
         if (msgCode instanceof ZrtpCodes.InfoCodes)
         {
             ZrtpCodes.InfoCodes inf = (ZrtpCodes.InfoCodes) msgCode;
-
+           
+            
             // If the ZRTP Master session (DH mode) signals "security on"
             // then start multi-stream sessions.
             // Signal SAS to GUI only if this is a DH mode session.
@@ -181,13 +182,13 @@ public void showMessage(ZrtpCodes.MessageSeverity sev,
                 {
                     multiStreams = ((CallSessionImpl) callSession)
                             .startZrtpMultiStreams();
-
-                    ((AbstractCallParticipant) callParticipant)
-                        .setSecurityOn(  true,
-                                         sessionType,
-                                         cipher,
-                                         sas,
-                                         isSasVerified);
+                    ((AbstractCallParticipant) callParticipant).setSecurityOn(true,
+                            sessionType, cipher, sas, isSasVerified);
+                }
+                else 
+                {
+                    ((AbstractCallParticipant) callParticipant).setSecurityOn(true,
+                        sessionType, cipher, null, false);
                 }
             }
         }