Commits work in progress on enabling ICE support in Jingle calls:

- Sends transport-info without content child extensions other than transport.
- Does not send candidates in session-accept if they have already been sent in transport-info.
- Does not wait for connectivity establishment to conclude before sending session-accept because the ICE controlling agent determines when the connectivity establishment concludes.

1 files changed, 12 insertions, 7 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jinglesdp/JingleUtils.java b/src/net/java/sip/communicator/impl/protocol/jabber/jinglesdp/JingleUtils.java
index bef4beb..bbb21b0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/jinglesdp/JingleUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/jinglesdp/JingleUtils.java
@@ -116,19 +116,24 @@ public class JingleUtils
                     DynamicPayloadTypeRegistry ptRegistry)
     {
         byte pt = (byte)payloadType.getID();
-        List<ParameterPacketExtension> params = payloadType.getParameters();
 
         //convert params to a name:value map
+        List<ParameterPacketExtension> params = payloadType.getParameters();
         Map<String, String> paramsMap = new HashMap<String, String>();
 
         for(ParameterPacketExtension param : params)
             paramsMap.put(param.getName(), param.getValue());
 
         //now create the format.
-        MediaFormat format = JabberActivator.getMediaService()
-            .getFormatFactory().createMediaFormat(
-                pt, payloadType.getName(), (double)payloadType.getClockrate(),
-                payloadType.getChannels(), paramsMap, null);
+        MediaFormat format
+            = JabberActivator.getMediaService().getFormatFactory()
+                    .createMediaFormat(
+                            pt,
+                            payloadType.getName(),
+                            (double)payloadType.getClockrate(),
+                            payloadType.getChannels(),
+                            paramsMap,
+                            null);
 
         //we don't seem to know anything about this format
         if(format == null)
@@ -527,8 +532,8 @@ public class JingleUtils
 
         for(Component component : stream.getComponents())
         {
-            for(Candidate cand : component.getLocalCandidates())
-                trans.addCandidate(createCandidate(cand));
+            for(Candidate candidate : component.getLocalCandidates())
+                trans.addCandidate(createCandidate(candidate));
         }
 
         return trans;