Adapt Call UI to multiple encryption methods

3 files changed, 31 insertions, 20 deletions

diff --git a/src/net/java/sip/communicator/service/neomedia/SrtpControl.java b/src/net/java/sip/communicator/service/neomedia/SrtpControl.java
index 64503a3..a4f553e 100644
--- a/src/net/java/sip/communicator/service/neomedia/SrtpControl.java
+++ b/src/net/java/sip/communicator/service/neomedia/SrtpControl.java
@@ -23,10 +23,10 @@ public interface SrtpControl
     public void cleanup();
 
     /**
-     * Sets a <tt>SrtpListener</tt> that will listen for
-     * srtp security events.
-     *
-     * @param srtpListener the <tt>SrtpListener</tt> to set
+     * Sets a <tt>SrtpListener</tt> that will listen for security events.
+     * 
+     * @param srtpListener the <tt>SrtpListener</tt> that will receive the
+     *            events
      */
     public void setSrtpListener(SrtpListener srtpListener);
 
@@ -47,13 +47,6 @@ public interface SrtpControl
     public boolean getSecureCommunicationStatus();
 
     /**
-     * Sets the SAS verification
-     *
-     * @param verified the new SAS verification status
-     */
-    public void setSASVerification(boolean verified);
-
-    /**
      * Starts and enables zrtp in the stream holding this control.
      * @param masterSession whether this stream is master for the current
      *        media session.
@@ -67,7 +60,7 @@ public interface SrtpControl
      * @param multiStreamData the multistream data comming from master stream
      *        needed to start rest of the streams in the session.
      */
-    public void setMultistream(byte[] multiStreamData);
+    public void setMultistream(SrtpControl master);
 
     /**
      * Returns the transform engine currently used by this stream.
diff --git a/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java b/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java
index 187c9ea..355ffcb 100644
--- a/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java
+++ b/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java
@@ -30,4 +30,25 @@ public interface ZrtpControl
      *         if ZRTP is not available.

      */

     public String[] getHelloHashSep();

+

+    /**

+     * Gets the SAS for the current media stream.

+     * 

+     * @return the four character ZRTP SAS.

+     */

+    public String getSecurityString();

+

+    /**

+     * Gets the status of the SAS verification.

+     * 

+     * @return true when the SAS has been verified.

+     */

+    public boolean isSecurityVerified();

+

+    /**

+     * Sets the SAS verification

+     *

+     * @param verified the new SAS verification status

+     */

+    public void setSASVerification(boolean verified);

 }

diff --git a/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java b/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java
index a455343..61383c6 100644
--- a/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java
+++ b/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java
@@ -6,6 +6,8 @@
  */
 package net.java.sip.communicator.service.neomedia.event;
 
+import net.java.sip.communicator.service.neomedia.SrtpControl;
+
 /**
  * The <tt>ZrtpListener</tt> is meant to be used by the media stream
  * creator, as the name indicates in order to be notified when a security event
@@ -23,17 +25,12 @@ public interface SrtpListener
      * event on non master stream the multiStreamData is null.
      * 
      * @param sessionType the type of the call session - audio or video.
-     * @param cipher the cipher
-     * @param securityString the SAS
-     * @param isVerified indicates if the SAS has been verified
-     * @param multiStreamData the data for the multistream
-     *        used by non master streams.
+     * @param cipher the security cipher that encrypts the call
+     * @param sender the control that initiated the event.
      */
     public void securityTurnedOn( int sessionType,
                             String cipher,
-                            String securityString,
-                            boolean isVerified,
-                            byte[] multiStreamData);
+                            SrtpControl sender);
 
     /**
      * Indicates that the security has been turned off.