diff --git a/lib/os-specific/linux/installer-exclude/jmf.jar b/lib/os-specific/linux/installer-exclude/jmf.jar index 1c703cdc1..3c6206a9d 100644 Binary files a/lib/os-specific/linux/installer-exclude/jmf.jar and b/lib/os-specific/linux/installer-exclude/jmf.jar differ diff --git a/lib/os-specific/mac/installer-exclude/jmf.jar b/lib/os-specific/mac/installer-exclude/jmf.jar index fadff4480..11baa3296 100644 Binary files a/lib/os-specific/mac/installer-exclude/jmf.jar and b/lib/os-specific/mac/installer-exclude/jmf.jar differ diff --git a/lib/os-specific/windows/installer-exclude/jmf.jar b/lib/os-specific/windows/installer-exclude/jmf.jar index 1333711a1..07e5c2cae 100644 Binary files a/lib/os-specific/windows/installer-exclude/jmf.jar and b/lib/os-specific/windows/installer-exclude/jmf.jar differ diff --git a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java index d5ed213ba..e0efb722a 100644 --- a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java +++ b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java @@ -2862,14 +2862,19 @@ public void setSecureCommunicationStatus(boolean activator, * (non-Javadoc) * @see net.java.sip.communicator.service.media.CallSession#setZrtpSASVerification(boolean) */ - public boolean setZrtpSASVerification(boolean verified) { - ZRTPTransformEngine engine = (ZRTPTransformEngine) zrtpDHSession - .getEngine(); - if (verified) { + public boolean setZrtpSASVerification(boolean verified) + { + ZRTPTransformEngine engine = + (ZRTPTransformEngine) zrtpDHSession.getEngine(); + + if (verified) + { engine.SASVerified(); - } else { + } else + { engine.resetSASVerified(); } + return true; } @@ -2886,7 +2891,7 @@ private void zrtpChangeStatus(RTPManager manager, SecureEvent event) { int newStatus = event.getEventID(); OperationSetSecureTelephony.SecureStatusChangeSource source - = event.getSource(); + = event.getSource(); TransformConnector transConnector = this.transConnectors.get(manager); @@ -2930,18 +2935,21 @@ private void zrtpChangeStatus(RTPManager manager, SecureEvent event) * * @return Number of started ZRTP multi-stream mode sessions */ - public int startZrtpMultiStreams() { + public int startZrtpMultiStreams() + { ZRTPTransformEngine engine - = (ZRTPTransformEngine)zrtpDHSession.getEngine(); + = (ZRTPTransformEngine)zrtpDHSession.getEngine(); int counter = 0; byte[] multiStreamData = engine.getMultiStrParams(); Enumeration tcs = transConnectors.elements(); - while (tcs.hasMoreElements()) { + while (tcs.hasMoreElements()) + { TransformConnector tc = tcs.nextElement(); - if (tc.equals(zrtpDHSession)) { + if (tc.equals(zrtpDHSession)) + { continue; } engine = (ZRTPTransformEngine)tc.getEngine(); @@ -3227,12 +3235,12 @@ protected void fireVideoEvent(int type, Component visualComponent, switch (type) { - case VideoEvent.VIDEO_ADDED: - listener.videoAdded(event); - break; - case VideoEvent.VIDEO_REMOVED: - listener.videoRemoved(event); - break; + case VideoEvent.VIDEO_ADDED: + listener.videoAdded(event); + break; + case VideoEvent.VIDEO_REMOVED: + listener.videoRemoved(event); + break; } } }