mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-09 00:59:39 +02:00
Use XmlEnvironment in parsing/provider subsystem
This commit is contained in:
parent
43bb418d99
commit
8df69bd3ce
188 changed files with 486 additions and 264 deletions
|
@ -31,6 +31,7 @@ import org.jivesoftware.smack.StanzaCollector;
|
|||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.IQProvider;
|
||||
import org.jivesoftware.smack.provider.ProviderManager;
|
||||
|
||||
|
@ -328,7 +329,7 @@ public class RTPBridge extends IQ {
|
|||
public static class Provider extends IQProvider<RTPBridge> {
|
||||
|
||||
@Override
|
||||
public RTPBridge parse(XmlPullParser parser, int initialDepth)
|
||||
public RTPBridge parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
|
||||
throws XmlPullParserException,
|
||||
IOException {
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@ import org.jivesoftware.smack.StanzaCollector;
|
|||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.SimpleIQ;
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.IQProvider;
|
||||
import org.jivesoftware.smack.provider.ProviderManager;
|
||||
|
||||
|
@ -116,7 +117,7 @@ public class STUN extends SimpleIQ {
|
|||
public static class Provider extends IQProvider<STUN> {
|
||||
|
||||
@Override
|
||||
public STUN parse(XmlPullParser parser, int initialDepth)
|
||||
public STUN parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
|
||||
throws XmlPullParserException,
|
||||
IOException {
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@ package org.jivesoftware.smackx.jingleold.packet;
|
|||
import java.util.Locale;
|
||||
|
||||
import org.jivesoftware.smack.packet.ExtensionElement;
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.media.ContentInfo;
|
||||
|
@ -142,7 +143,7 @@ public class JingleError implements ExtensionElement {
|
|||
* Parse a JingleDescription.Audio extension.
|
||||
*/
|
||||
@Override
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth) {
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) {
|
||||
ExtensionElement result = null;
|
||||
|
||||
if (audioInfo != null) {
|
||||
|
|
|
@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingleold.provider;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.media.PayloadType;
|
||||
|
@ -70,7 +71,7 @@ public abstract class JingleContentDescriptionProvider extends ExtensionElementP
|
|||
*/
|
||||
@Override
|
||||
public JingleContentDescription parse(XmlPullParser parser,
|
||||
int initialDepth) throws XmlPullParserException,
|
||||
int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException,
|
||||
IOException {
|
||||
boolean done = false;
|
||||
JingleContentDescription desc = getInstance();
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
package org.jivesoftware.smackx.jingleold.provider;
|
||||
|
||||
import org.jivesoftware.smack.packet.ExtensionElement;
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.media.ContentInfo;
|
||||
|
@ -59,7 +60,7 @@ public class JingleContentInfoProvider {
|
|||
* Parse a JingleDescription.Audio extension.
|
||||
*/
|
||||
@Override
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth) {
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) {
|
||||
ExtensionElement result = null;
|
||||
|
||||
if (audioInfo != null) {
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
*/
|
||||
package org.jivesoftware.smackx.jingleold.provider;
|
||||
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.packet.JingleContent;
|
||||
|
@ -33,7 +34,7 @@ public class JingleContentProvider extends ExtensionElementProvider<JingleConten
|
|||
* Parse a JingleContent extension.
|
||||
*/
|
||||
@Override
|
||||
public JingleContent parse(XmlPullParser parser, int initialDepth) {
|
||||
public JingleContent parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) {
|
||||
String elementName = parser.getName();
|
||||
String creator = parser.getAttributeValue("", JingleContent.CREATOR);
|
||||
String name = parser.getAttributeValue("", JingleContent.NAME);
|
||||
|
|
|
@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingleold.provider;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.media.PayloadType;
|
||||
|
@ -70,7 +71,7 @@ public abstract class JingleDescriptionProvider extends ExtensionElementProvider
|
|||
* @throws XmlPullParserException
|
||||
*/
|
||||
@Override
|
||||
public JingleDescription parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
|
||||
public JingleDescription parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
|
||||
boolean done = false;
|
||||
JingleDescription desc = getInstance();
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ package org.jivesoftware.smackx.jingleold.provider;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.parsing.SmackParsingException;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
import org.jivesoftware.smack.provider.IQProvider;
|
||||
|
@ -49,7 +50,7 @@ public class JingleProvider extends IQProvider<Jingle> {
|
|||
* @throws SmackParsingException
|
||||
*/
|
||||
@Override
|
||||
public Jingle parse(XmlPullParser parser, int intialDepth) throws IOException, XmlPullParserException, SmackParsingException {
|
||||
public Jingle parse(XmlPullParser parser, int intialDepth, XmlEnvironment xmlEnvironment) throws IOException, XmlPullParserException, SmackParsingException {
|
||||
|
||||
Jingle jingle = new Jingle();
|
||||
String sid = "";
|
||||
|
|
|
@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingleold.provider;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.provider.ExtensionElementProvider;
|
||||
|
||||
import org.jivesoftware.smackx.jingleold.nat.ICECandidate;
|
||||
|
@ -53,7 +54,7 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
|
|||
* @throws XmlPullParserException
|
||||
*/
|
||||
@Override
|
||||
public JingleTransport parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
|
||||
public JingleTransport parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
|
||||
boolean done = false;
|
||||
JingleTransport trans = getInstance();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue