Fix security on notification for call conferences

src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java

@@ -575,9 +575,10 @@ private synchronized void startSendingDtmfTone(DTMFToneInfo info)
 
         if (callContainer != null)
         {
-            startSendingDtmfTone(
-                callContainer.getCurrentCallRenderer().getCall(),
-                info);
+            for (Call c : callContainer.getCallConference().getCalls())
+            {
+                startSendingDtmfTone(c, info);
+            }
         }
         else
         {
@@ -617,8 +618,10 @@ public synchronized void stopSendingDtmfTone()
     {
         if (callContainer != null)
         {
-            stopSendingDtmfTone(
-                    callContainer.getCurrentCallRenderer().getCall());
+            for (Call c : callContainer.getCallConference().getCalls())
+            {
+                stopSendingDtmfTone(c);
+            }
         }
         else
         {

src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java

@@ -290,15 +290,6 @@ public void dispose()
             peerPanel.dispose();
     }
 
-    /**
-     * Returns the call represented by this call renderer.
-     * @return the call represented by this call renderer
-     */
-    public Call getCall()
-    {
-        return call;
-    }
-
     /**
      * Returns the parent call container, where this renderer is contained.
      * @return the parent call container, where this renderer is contained

src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java

@@ -325,18 +325,6 @@ public void fireConferencePeerViewEvent(int eventID, CallPeer callPeer,
 
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * <tt>BasicConferenceCallPanel</tt> always returns <tt>null</tt> because it
-     * depicts a <tt>CallConference</tt> which may have multiple <tt>Call</tt>s.
-     */
-    public Call getCall()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     /**
      * {@inheritDoc}
      *

src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java

@@ -485,8 +485,13 @@ public void securityOn(CallPeerSecurityOnEvent evt)
         SrtpControl srtpControl = evt.getSecurityController();
 
         if (!srtpControl.requiresSecureSignalingTransport()
-                || getCallRenderer().getCall().getProtocolProvider()
-                        .isSignalingTransportSecure())
+                || getCallRenderer()
+                    .getCallContainer()
+                    .getCallConference()
+                    .getCalls()
+                    .get(0)
+                    .getProtocolProvider()
+                    .isSignalingTransportSecure())
         {
             if (srtpControl instanceof ZrtpControl)
             {

src/net/java/sip/communicator/service/gui/call/CallRenderer.java

@@ -25,13 +25,6 @@ public interface CallRenderer
      */
     public void dispose();
 
-    /**
-     * Returns the <tt>Call</tt> depicted by this renderer.
-     *
-     * @return the <tt>Call</tt> depicted by this renderer
-     */
-    public Call getCall();
-
     /**
      * Returns the <tt>CallPeerRenderer</tt> corresponding to the given
      * <tt>callPeer</tt>.