Patches things so that we would be able to commit the beginnings of our jingle implementation and the XEP-0115 support

src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java

@@ -16,6 +16,8 @@
 
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.provider.*;
+import org.jivesoftware.smackx.*;
+import org.jivesoftware.smackx.packet.*;
 
 /**
  * Implements all call management logic and exports basic telephony support by

src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JingleIQProvider.java

@@ -7,8 +7,6 @@
 package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
 import net.java.sip.communicator.util.*;
 
-import org.jivesoftware.smack.*;
-import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -36,79 +34,10 @@ public class JingleIQProvider implements IQProvider
      *
      * @throws Exception if an error occurs parsing the XML.
      */
-    public IQ parseIQ(XmlPullParser parser) throws Exception
+    public JingleIQ parseIQ(XmlPullParser parser)
+        throws Exception
     {
-        JingleIQ jingleIQ = new JingleIQ();
-        String sessionID = null;
-        String initiator = null;
-        String responder = null;
-        boolean done = false;
-        JingleContent currentContent = null;
-
-        // Sub-elements providers
-        JingleContentProvider jcp = new JingleContentProvider();
-        JingleDescriptionProvider jdpAudio = new JingleDescriptionProvider.Audio();
-        JingleTransportProvider jtpRawUdp = new JingleTransportProvider.RawUdp();
-        JingleTransportProvider jtpIce = new JingleTransportProvider.Ice();
-        JingleContentInfoProvider jmipAudio = new JingleContentInfoProvider.Audio();
-
-        int eventType;
-        String elementName;
-        String namespace;
-
-        // Get some attributes for the <jingle> element
-        sessionID = parser.getAttributeValue("", "sid");
-        action = JingleActionEnum.getAction(parser.getAttributeValue("", "action"));
-        initiator = parser.getAttributeValue("", "initiator");
-        responder = parser.getAttributeValue("", "responder");
-
-        jingleIQ.setSid(sessionID);
-        jingleIQ.setAction(action);
-        jingleIQ.setInitiator(initiator);
-        jingleIQ.setResponder(responder);
-
-        // Start processing sub-elements
-        while (!done) {
-            eventType = parser.next();
-            elementName = parser.getName();
-            namespace = parser.getNamespace();
-
-            if (eventType == XmlPullParser.START_TAG) {
-
-                // Parse some well know subelements, depending on the namespaces
-                // and element names...
-
-                if (elementName.equals(JingleContent.NODENAME)) {
-                    // Add a new <content> element to the jingle
-                    currentContent = (JingleContent) jcp.parseExtension(parser);
-                    jingleIQ.addContent(currentContent);
-                } else if (elementName.equals(JingleDescription.NODENAME) && namespace.equals(JingleDescription.Audio.NAMESPACE)) {
-                    // Set the <description> element of the <content>
-                    currentContent.setDescription((JingleDescription) jdpAudio.parseExtension(parser));
-                } else if (elementName.equals(JingleTransport.NODENAME)) {
-                    // Add all of the <transport> elements to the <content> of the jingle
-
-                    // Parse the possible transport namespaces
-                    if (namespace.equals(JingleTransport.RawUdp.NAMESPACE)) {
-                        currentContent.addJingleTransport((JingleTransport) jtpRawUdp.parseExtension(parser));
-                    } else if (namespace.equals(JingleTransport.Ice.NAMESPACE)) {
-                        currentContent.addJingleTransport((JingleTransport) jtpIce.parseExtension(parser));
-                    } else {
-                        throw new XMPPException("Unknown transport namespace \"" + namespace + "\" in Jingle packet.");
-                    }
-                } else if (namespace.equals(JingleContentInfo.Audio.NAMESPACE)) {
-                    jingleIQ.setContentInfo((JingleContentInfo) jmipAudio.parseExtension(parser));
-                } else {
-                    throw new XMPPException("Unknown combination of namespace \"" + namespace + "\" and element name \""
-                            + elementName + "\" in Jingle packet.");
-                }
-
-            } else if (eventType == XmlPullParser.END_TAG) {
-                if (parser.getName().equals(Jingle.getElementName())) {
-                    done = true;
-                }
-            }
-        }
+        JingleIQ jingleIQ = null;
 
         return jingleIQ;
     }