vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.1'

Browse source 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-04 22:42:36 +01:00
commit 701aa7d9c4
298 changed files with 2402 additions and 1562 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java
View file

@ -175,7 +175,7 @@ public class JingleManagerTest extends SmackTestCase {
iqSent.setType(IQ.Type.set);
System.out.println("Sending packet and waiting... ");
getConnection(1).sendPacket(iqSent);
getConnection(1).sendStanza(iqSent);
try {
Thread.sleep(10000);
} catch (InterruptedException e) {

2
smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java
View file

@ -368,7 +368,7 @@ public class JingleMediaTest extends SmackTestCase {
Thread.sleep(20000);
//js0.sendFormattedError(JingleError.UNSUPPORTED_TRANSPORTS);
js0.sendPacket(js0.createJingleError(null, JingleError.UNSUPPORTED_TRANSPORTS));
js0.sendStanza(js0.createJingleError(null, JingleError.UNSUPPORTED_TRANSPORTS));
Thread.sleep(20000);

6
smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
View file

@ -17,7 +17,7 @@ package org.jivesoftware.smackx.jingle.provider;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.filter.StanzaTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.provider.ProviderManager;
@ -69,13 +69,13 @@ public class JingleProviderTest extends SmackTestCase {
iqSent.setType(IQ.Type.get);
// Create a filter and a collector...
PacketFilter filter = new PacketTypeFilter(IQ.class);
PacketFilter filter = new StanzaTypeFilter(IQ.class);
PacketCollector collector = getConnection(0).createPacketCollector(filter);
System.out.println("Testing if a Jingle IQ can be sent and received...");
// Send the iq packet with an invalid namespace
getConnection(0).sendPacket(iqSent);
getConnection(0).sendStanza(iqSent);
// Receive the packet
IQ iqReceived = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout());

8
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
View file

@ -22,12 +22,12 @@ import java.util.List;
import java.util.logging.Logger;
import org.jivesoftware.smack.ConnectionCreationListener;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPConnectionRegistry;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
@ -443,7 +443,7 @@ public class JingleManager implements JingleSessionListener {
* establish a new session.
*/
private void initJingleSessionRequestListeners() {
PacketFilter initRequestFilter = new PacketFilter() {
StanzaFilter initRequestFilter = new StanzaFilter() {
// Return true if we accept this packet
public boolean accept(Stanza pin) {
if (pin instanceof IQ) {
@ -464,7 +464,7 @@ public class JingleManager implements JingleSessionListener {
jingleSessionRequestListeners = new ArrayList<JingleSessionRequestListener>();
// Start a packet listener for session initiation requests
connection.addAsyncPacketListener(new PacketListener() {
connection.addAsyncStanzaListener(new StanzaListener() {
public void processPacket(Stanza packet) {
triggerSessionRequested((Jingle) packet);
}

42
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
View file

@ -25,12 +25,12 @@ import java.util.logging.Logger;
import org.jivesoftware.smack.AbstractConnectionClosedListener;
import org.jivesoftware.smack.ConnectionListener;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.XMPPError;
@ -78,9 +78,9 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
ConnectionListener connectionListener;
PacketListener packetListener;
StanzaListener packetListener;
PacketFilter packetFilter;
StanzaFilter packetFilter;
protected List<JingleMediaManager> jingleMediaManagers = null;
@ -327,12 +327,12 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// // If the response is anything other than a RESULT then send it now.
// if ((response != null) && (!response.getType().equals(IQ.Type.result))) {
// getConnection().sendPacket(response);
// getConnection().sendStanza(response);
// }
// Loop through all of the responses and send them.
for (IQ response : responses) {
sendPacket(response);
sendStanza(response);
}
}
@ -400,7 +400,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// Send section
// ----------------------------------------------------------------------------------------------------------
public void sendPacket(IQ iq) throws NotConnectedException, InterruptedException {
public void sendStanza(IQ iq) throws NotConnectedException, InterruptedException {
if (iq instanceof Jingle) {
@ -408,7 +408,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
} else {
getConnection().sendPacket(iq);
getConnection().sendStanza(iq);
}
}
@ -472,7 +472,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// The the packet.
if ((getConnection() != null) && (getConnection().isConnected()))
getConnection().sendPacket(jout);
getConnection().sendStanza(jout);
}
return jout;
}
@ -488,7 +488,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// updatePacketListener();
//
// // Send the actual packet.
// sendPacket(inJingle);
// sendStanza(inJingle);
//
// // Change to the PENDING state.
// setSessionState(JingleSessionStateEnum.PENDING);
@ -512,7 +512,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
IQ ack = IQ.createResultIQ(iq);
// No! Don't send it. Let it flow to the normal way IQ results get processed and sent.
// getConnection().sendPacket(ack);
// getConnection().sendStanza(ack);
result = ack;
}
}
@ -523,7 +523,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
* Send a content info message.
*/
// public synchronized void sendContentInfo(ContentInfo ci) {
// sendPacket(new Jingle(new JingleContentInfo(ci)));
// sendStanza(new Jingle(new JingleContentInfo(ci)));
// }
/*
* (non-Javadoc)
@ -656,7 +656,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
*/
protected void removeAsyncPacketListener() {
if (packetListener != null) {
getConnection().removeAsyncPacketListener(packetListener);
getConnection().removeAsyncStanzaListener(packetListener);
LOGGER.fine("JINGLE SESSION: REMOVE PACKET LISTENER");
}
@ -671,7 +671,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
LOGGER.fine("UpdatePacketListener");
packetListener = new PacketListener() {
packetListener = new StanzaListener() {
public void processPacket(Stanza packet) {
try {
receivePacketAndRespond((IQ) packet);
@ -681,7 +681,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
}
};
packetFilter = new PacketFilter() {
packetFilter = new StanzaFilter() {
public boolean accept(Stanza packet) {
if (packet instanceof IQ) {
@ -728,7 +728,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
}
};
getConnection().addAsyncPacketListener(packetListener, packetFilter);
getConnection().addAsyncStanzaListener(packetListener, packetFilter);
}
// Listeners
@ -811,7 +811,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
}
// Send the "accept" and wait for the ACK
addExpectedId(jout.getStanzaId());
sendPacket(jout);
sendStanza(jout);
//triggerSessionEstablished();
@ -843,7 +843,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
}
// Send the "accept" and wait for the ACK
addExpectedId(jout.getStanzaId());
sendPacket(jout);
sendStanza(jout);
}
}
}
@ -981,7 +981,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
LOGGER.fine("Terminate " + reason);
Jingle jout = new Jingle(JingleActionEnum.SESSION_TERMINATE);
jout.setType(IQ.Type.set);
sendPacket(jout);
sendStanza(jout);
triggerSessionClosed(reason);
}
@ -1042,7 +1042,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// errorPacket.addExtension(jingleError);
// NO! Let the normal state machinery do all of the sending.
// getConnection().sendPacket(perror);
// getConnection().sendStanza(perror);
LOGGER.severe("Error sent: " + errorPacket.toXML());
}
return errorPacket;
@ -1102,7 +1102,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// Save the session-initiate packet ID, so that we can respond to it.
sessionInitPacketID = jingle.getStanzaId();
sendPacket(jingle);
sendStanza(jingle);
// Now setup to track the media negotiators, so that we know when (if) to send a session-accept.
setupListeners();

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
View file

@ -614,7 +614,7 @@ public abstract class TransportCandidate {
String id = null;
byte[] send = null;
byte[] receive = null;
DatagramPacket sendPacket = null;
DatagramPacket sendStanza = null;
List<DatagramListener> listeners = new ArrayList<DatagramListener>();
List<ResultListener> resultListeners = new ArrayList<ResultListener>();
boolean enabled = true;

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java
View file

@ -21,14 +21,14 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
/**
* Jingle content.
*
* @author Jeff Williams
*/
public class JingleContent implements PacketExtension {
public class JingleContent implements ExtensionElement {
public static final String NODENAME = "content";
public static final String CREATOR = "creator";

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingleold.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.jingleold.media.PayloadType;
import java.util.ArrayList;
@ -29,7 +29,7 @@ import java.util.List;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public abstract class JingleContentDescription implements PacketExtension {
public abstract class JingleContentDescription implements ExtensionElement {
// static

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingleold.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.jingleold.media.ContentInfo;
/**
@ -24,7 +24,7 @@ import org.jivesoftware.smackx.jingleold.media.ContentInfo;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public class JingleContentInfo implements PacketExtension {
public class JingleContentInfo implements ExtensionElement {
protected ContentInfo mediaInfoElement;

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java
View file

@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.logging.Logger;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.jingleold.media.PayloadType;
/**
@ -30,7 +30,7 @@ import org.jivesoftware.smackx.jingleold.media.PayloadType;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public abstract class JingleDescription implements PacketExtension {
public abstract class JingleDescription implements ExtensionElement {
private static final Logger LOGGER = Logger.getLogger(JingleDescription.class.getName());

14
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java
View file

@ -19,12 +19,12 @@ package org.jivesoftware.smackx.jingleold.packet;
import java.util.Locale;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.media.ContentInfo;
import org.xmlpull.v1.XmlPullParser;
public class JingleError implements PacketExtension {
public class JingleError implements ExtensionElement {
public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
@ -122,9 +122,9 @@ public class JingleError implements PacketExtension {
return NAMESPACE;
}
public static class Provider extends PacketExtensionProvider<PacketExtension> {
public static class Provider extends ExtensionElementProvider<ExtensionElement> {
private PacketExtension audioInfo;
private ExtensionElement audioInfo;
/**
* Empty constructor.
@ -136,8 +136,8 @@ public class JingleError implements PacketExtension {
* Parse a JingleDescription.Audio extension.
*/
@Override
public PacketExtension parse(XmlPullParser parser, int initialDepth) {
PacketExtension result = null;
public ExtensionElement parse(XmlPullParser parser, int initialDepth) {
ExtensionElement result = null;
if (audioInfo != null) {
result = audioInfo;

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingleold.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.jingleold.nat.ICECandidate;
import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
@ -30,7 +30,7 @@ import java.util.List;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public class JingleTransport implements PacketExtension {
public class JingleTransport implements ExtensionElement {
// static

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java
View file

@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jingleold.provider;
import java.io.IOException;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription;
import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription.JinglePayloadType;
@ -31,7 +31,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public abstract class JingleContentDescriptionProvider extends PacketExtensionProvider<JingleContentDescription> {
public abstract class JingleContentDescriptionProvider extends ExtensionElementProvider<JingleContentDescription> {
/**
* Parse a iq/jingle/description/payload-type element.

14
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java
View file

@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingleold.provider;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.media.ContentInfo;
import org.jivesoftware.smackx.jingleold.packet.JingleContentInfo;
import org.xmlpull.v1.XmlPullParser;
@ -32,9 +32,9 @@ public class JingleContentInfoProvider {
/**
* JingleDescription.Audio info provider
*/
public static class Audio extends PacketExtensionProvider<PacketExtension> {
public static class Audio extends ExtensionElementProvider<ExtensionElement> {
private final PacketExtension audioInfo;
private final ExtensionElement audioInfo;
/**
* Empty constructor.
@ -48,7 +48,7 @@ public class JingleContentInfoProvider {
*
* @param audioInfo the jmf info
*/
public Audio(final PacketExtension audioInfo) {
public Audio(final ExtensionElement audioInfo) {
super();
this.audioInfo = audioInfo;
}
@ -57,8 +57,8 @@ public class JingleContentInfoProvider {
* Parse a JingleDescription.Audio extension.
*/
@Override
public PacketExtension parse(XmlPullParser parser, int initialDepth) {
PacketExtension result = null;
public ExtensionElement parse(XmlPullParser parser, int initialDepth) {
ExtensionElement result = null;
if (audioInfo != null) {
result = audioInfo;

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingleold.provider;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.packet.JingleContent;
import org.xmlpull.v1.XmlPullParser;
@ -25,7 +25,7 @@ import org.xmlpull.v1.XmlPullParser;
*
* @author Jeff Williams
*/
public class JingleContentProvider extends PacketExtensionProvider<JingleContent> {
public class JingleContentProvider extends ExtensionElementProvider<JingleContent> {
/**
* Parse a JingleContent extension.

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java
View file

@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jingleold.provider;
import java.io.IOException;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
import org.xmlpull.v1.XmlPullParser;
@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public abstract class JingleDescriptionProvider extends PacketExtensionProvider<JingleDescription> {
public abstract class JingleDescriptionProvider extends ExtensionElementProvider<JingleDescription> {
/**
* Parse a iq/jingle/description/payload-type element.

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
View file

@ -21,7 +21,7 @@ import java.io.IOException;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smackx.jingleold.JingleActionEnum;
import org.jivesoftware.smackx.jingleold.packet.Jingle;
@ -63,7 +63,7 @@ public class JingleProvider extends IQProvider<Jingle> {
JingleDescriptionProvider jdpAudio = new JingleDescriptionProvider.Audio();
JingleTransportProvider jtpRawUdp = new JingleTransportProvider.RawUdp();
JingleTransportProvider jtpIce = new JingleTransportProvider.Ice();
PacketExtensionProvider jmipAudio = new JingleContentInfoProvider.Audio();
ExtensionElementProvider jmipAudio = new JingleContentInfoProvider.Audio();
int eventType;
String elementName;

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
View file

@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jingleold.provider;
import java.io.IOException;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.jingleold.nat.ICECandidate;
import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Alvaro Saurin <alvaro.saurin@gmail.com>
*/
public abstract class JingleTransportProvider extends PacketExtensionProvider<JingleTransport> {
public abstract class JingleTransportProvider extends ExtensionElementProvider<JingleTransport> {
/**
* Obtain the corresponding TransportNegotiator instance.