vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +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

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
View file

@ -22,12 +22,12 @@ import java.util.Map;
import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
/**
* MetaData packet extension.
*/
public class MetaData implements PacketExtension {
public class MetaData implements ExtensionElement {
/**
* Element name of the packet extension.

22
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
View file

@ -19,11 +19,11 @@ package org.jivesoftware.smackx.workgroup.agent;
import org.jivesoftware.smackx.workgroup.packet.AgentStatus;
import org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.filter.StanzaTypeFilter;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jxmpp.jid.FullJid;
@ -75,16 +75,16 @@ public class AgentRoster {
entries = new ArrayList<String>();
listeners = new ArrayList<AgentRosterListener>();
// Listen for any roster packets.
PacketFilter rosterFilter = new PacketTypeFilter(AgentStatusRequest.class);
connection.addAsyncPacketListener(new AgentStatusListener(), rosterFilter);
StanzaFilter rosterFilter = new StanzaTypeFilter(AgentStatusRequest.class);
connection.addAsyncStanzaListener(new AgentStatusListener(), rosterFilter);
// Listen for any presence packets.
connection.addAsyncPacketListener(new PresencePacketListener(),
new PacketTypeFilter(Presence.class));
connection.addAsyncStanzaListener(new PresencePacketListener(),
new StanzaTypeFilter(Presence.class));
// Send request for roster.
AgentStatusRequest request = new AgentStatusRequest();
request.setTo(workgroupJID);
connection.sendPacket(request);
connection.sendStanza(request);
}
/**
@ -97,7 +97,7 @@ public class AgentRoster {
public void reload() throws NotConnectedException, InterruptedException {
AgentStatusRequest request = new AgentStatusRequest();
request.setTo(workgroupJID);
connection.sendPacket(request);
connection.sendStanza(request);
}
/**
@ -284,7 +284,7 @@ public class AgentRoster {
/**
* Listens for all presence packets and processes them.
*/
private class PresencePacketListener implements PacketListener {
private class PresencePacketListener implements StanzaListener {
public void processPacket(Stanza packet) {
Presence presence = (Presence)packet;
FullJid from = presence.getFrom().asFullJidIfPossible();
@ -359,7 +359,7 @@ public class AgentRoster {
/**
* Listens for all roster packets and processes them.
*/
private class AgentStatusListener implements PacketListener {
private class AgentStatusListener implements StanzaListener {
public void processPacket(Stanza packet) {
if (packet instanceof AgentStatusRequest) {

44
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
View file

@ -30,7 +30,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.SmackException.NotConnectedException;
@ -40,8 +40,8 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.FromMatchesFilter;
import org.jivesoftware.smack.filter.OrFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.DefaultPacketExtension;
import org.jivesoftware.smack.filter.StanzaTypeFilter;
import org.jivesoftware.smack.packet.DefaultExtensionElement;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Stanza;
@ -109,7 +109,7 @@ public class AgentSession {
private TranscriptManager transcriptManager;
private TranscriptSearchManager transcriptSearchManager;
private Agent agent;
private PacketListener packetListener;
private StanzaListener packetListener;
/**
* Constructs a new agent session instance. Note, the {@link #setOnline(boolean)}
@ -141,12 +141,12 @@ public class AgentSession {
// Create a filter to listen for packets we're interested in.
OrFilter filter = new OrFilter(
new PacketTypeFilter(OfferRequestProvider.OfferRequestPacket.class),
new PacketTypeFilter(OfferRevokeProvider.OfferRevokePacket.class),
new PacketTypeFilter(Presence.class),
new PacketTypeFilter(Message.class));
new StanzaTypeFilter(OfferRequestProvider.OfferRequestPacket.class),
new StanzaTypeFilter(OfferRevokeProvider.OfferRevokePacket.class),
new StanzaTypeFilter(Presence.class),
new StanzaTypeFilter(Message.class));
packetListener = new PacketListener() {
packetListener = new StanzaListener() {
public void processPacket(Stanza packet) {
try {
handlePacket(packet);
@ -156,7 +156,7 @@ public class AgentSession {
}
}
};
connection.addAsyncPacketListener(packetListener, filter);
connection.addAsyncStanzaListener(packetListener, filter);
// Create the agent associated to this session
agent = new Agent(connection, workgroupJID);
}
@ -166,7 +166,7 @@ public class AgentSession {
* packet listeners that were added by this agent session will be removed.
*/
public void close() {
connection.removeAsyncPacketListener(packetListener);
connection.removeAsyncStanzaListener(packetListener);
}
/**
@ -301,11 +301,11 @@ public class AgentSession {
if (online) {
presence = new Presence(Presence.Type.available);
presence.setTo(workgroupJID);
presence.addExtension(new DefaultPacketExtension(AgentStatus.ELEMENT_NAME,
presence.addExtension(new DefaultExtensionElement(AgentStatus.ELEMENT_NAME,
AgentStatus.NAMESPACE));
PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(
new PacketTypeFilter(Presence.class), FromMatchesFilter.create(workgroupJID)), presence);
new StanzaTypeFilter(Presence.class), FromMatchesFilter.create(workgroupJID)), presence);
presence = (Presence)collector.nextResultOrThrow();
@ -319,9 +319,9 @@ public class AgentSession {
presence = new Presence(Presence.Type.unavailable);
presence.setTo(workgroupJID);
presence.addExtension(new DefaultPacketExtension(AgentStatus.ELEMENT_NAME,
presence.addExtension(new DefaultExtensionElement(AgentStatus.ELEMENT_NAME,
AgentStatus.NAMESPACE));
connection.sendPacket(presence);
connection.sendStanza(presence);
}
}
@ -399,14 +399,14 @@ public class AgentSession {
presence.setStatus(status);
}
// Send information about max chats and current chats as a packet extension.
DefaultPacketExtension agentStatus = new DefaultPacketExtension(AgentStatus.ELEMENT_NAME,
DefaultExtensionElement agentStatus = new DefaultExtensionElement(AgentStatus.ELEMENT_NAME,
AgentStatus.NAMESPACE);
agentStatus.setValue("max-chats", "" + maxChats);
presence.addExtension(agentStatus);
presence.addExtension(new MetaData(this.metaData));
PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(
new PacketTypeFilter(Presence.class),
new StanzaTypeFilter(Presence.class),
FromMatchesFilter.create(workgroupJID)), presence);
collector.nextResultOrThrow();
@ -450,7 +450,7 @@ public class AgentSession {
}
presence.addExtension(new MetaData(this.metaData));
PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(new PacketTypeFilter(Presence.class),
PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(new StanzaTypeFilter(Presence.class),
FromMatchesFilter.create(workgroupJID)), presence);
collector.nextResultOrThrow();
@ -472,7 +472,7 @@ public class AgentSession {
DepartQueuePacket departPacket = new DepartQueuePacket(this.workgroupJID);
// PENDING
this.connection.sendPacket(departPacket);
this.connection.sendStanza(departPacket);
}
/**
@ -705,7 +705,7 @@ public class AgentSession {
if (packet instanceof OfferRequestProvider.OfferRequestPacket) {
// Acknowledge the IQ set.
IQ reply = IQ.createResultIQ((IQ) packet);
connection.sendPacket(reply);
connection.sendStanza(reply);
fireOfferRequestEvent((OfferRequestProvider.OfferRequestPacket)packet);
}
@ -753,7 +753,7 @@ public class AgentSession {
}
// Notify agent packets gives an overview of agent activity in a queue.
DefaultPacketExtension notifyAgents = (DefaultPacketExtension)presence.getExtension("notify-agents", "http://jabber.org/protocol/workgroup");
DefaultExtensionElement notifyAgents = (DefaultExtensionElement)presence.getExtension("notify-agents", "http://jabber.org/protocol/workgroup");
if (notifyAgents != null) {
int currentChats = Integer.parseInt(notifyAgents.getValue("current-chats"));
int maxChats = Integer.parseInt(notifyAgents.getValue("max-chats"));
@ -794,7 +794,7 @@ public class AgentSession {
else if (packet instanceof OfferRevokeProvider.OfferRevokePacket) {
// Acknowledge the IQ set.
IQ reply = IQ.createResultIQ((OfferRevokeProvider.OfferRevokePacket) packet);
connection.sendPacket(reply);
connection.sendStanza(reply);
fireOfferRevokeEvent((OfferRevokeProvider.OfferRevokePacket)packet);
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
View file

@ -86,7 +86,7 @@ public class Offer {
*/
public void accept() throws NotConnectedException, InterruptedException {
Stanza acceptPacket = new AcceptPacket(this.session.getWorkgroupJID());
connection.sendPacket(acceptPacket);
connection.sendStanza(acceptPacket);
// TODO: listen for a reply.
accepted = true;
}
@ -98,7 +98,7 @@ public class Offer {
*/
public void reject() throws NotConnectedException, InterruptedException {
RejectPacket rejectPacket = new RejectPacket(this.session.getWorkgroupJID());
connection.sendPacket(rejectPacket);
connection.sendStanza(rejectPacket);
// TODO: listen for a reply.
rejected = true;
}

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
View file

@ -56,7 +56,7 @@ public class OfferConfirmation extends SimpleIQ {
public void notifyService(XMPPConnection con, Jid workgroup, String createdRoomName) throws NotConnectedException, InterruptedException {
NotifyServicePacket packet = new NotifyServicePacket(workgroup, createdRoomName);
con.sendPacket(packet);
con.sendStanza(packet);
}
public static class Provider extends IQProvider<OfferConfirmation> {

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
View file

@ -60,7 +60,7 @@ public class WorkgroupForm extends SimpleIQ {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
// Parse the packet extension
PacketParserUtils.addPacketExtension(answer, parser);
PacketParserUtils.addExtensionElement(answer, parser);
}
else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals(ELEMENT_NAME)) {

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
View file

@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -36,7 +36,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Matt Tucker
*/
public class AgentStatus implements PacketExtension {
public class AgentStatus implements ExtensionElement {
private static final SimpleDateFormat UTC_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HH:mm:ss");
@ -223,7 +223,7 @@ public class AgentStatus implements PacketExtension {
/**
* Packet extension provider for AgentStatus packets.
*/
public static class Provider extends PacketExtensionProvider<AgentStatus> {
public static class Provider extends ExtensionElementProvider<AgentStatus> {
@Override
public AgentStatus parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
View file

@ -23,7 +23,7 @@ import java.util.Map;
import org.jivesoftware.smackx.workgroup.MetaData;
import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author loki der quaeler
*/
public class MetaDataProvider extends PacketExtensionProvider<MetaData> {
public class MetaDataProvider extends ExtensionElementProvider<MetaData> {
/**
* PacketExtensionProvider implementation

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
View file

@ -19,8 +19,8 @@ package org.jivesoftware.smackx.workgroup.packet;
import org.jivesoftware.smackx.workgroup.QueueUser;
import org.jivesoftware.smack.SmackException;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -37,7 +37,7 @@ import java.util.logging.Logger;
* Queue details packet extension, which contains details about the users
* currently in a queue.
*/
public class QueueDetails implements PacketExtension {
public class QueueDetails implements ExtensionElement {
private static final Logger LOGGER = Logger.getLogger(QueueDetails.class.getName());
/**
@ -143,7 +143,7 @@ public class QueueDetails implements PacketExtension {
/**
* Provider class for QueueDetails packet extensions.
*/
public static class Provider extends PacketExtensionProvider<QueueDetails> {
public static class Provider extends ExtensionElementProvider<QueueDetails> {
@Override
public QueueDetails parse(XmlPullParser parser,

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
View file

@ -19,8 +19,8 @@ package org.jivesoftware.smackx.workgroup.packet;
import org.jivesoftware.smackx.workgroup.agent.WorkgroupQueue;
import org.jivesoftware.smack.SmackException;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -29,7 +29,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
public class QueueOverview implements PacketExtension {
public class QueueOverview implements ExtensionElement {
/**
* Element name of the packet extension.
@ -117,7 +117,7 @@ public class QueueOverview implements PacketExtension {
return buf.toString();
}
public static class Provider extends PacketExtensionProvider<QueueOverview> {
public static class Provider extends ExtensionElementProvider<QueueOverview> {
@Override
public QueueOverview parse(XmlPullParser parser,

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
View file

@ -19,8 +19,8 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -29,7 +29,7 @@ import org.xmlpull.v1.XmlPullParserException;
* status notifications -- position updates, and estimated time
* left in the queue updates.
*/
public class QueueUpdate implements PacketExtension {
public class QueueUpdate implements ExtensionElement {
/**
* Element name of the packet extension.
@ -90,7 +90,7 @@ public class QueueUpdate implements PacketExtension {
return NAMESPACE;
}
public static class Provider extends PacketExtensionProvider<QueueUpdate> {
public static class Provider extends ExtensionElementProvider<QueueUpdate> {
@Override
public QueueUpdate parse(XmlPullParser parser, int initialDepth)

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
View file

@ -20,9 +20,9 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Gaston Dombiak
*/
public class RoomInvitation implements PacketExtension {
public class RoomInvitation implements ExtensionElement {
/**
* Element name of the packet extension.
@ -158,7 +158,7 @@ public class RoomInvitation implements PacketExtension {
}
}
public static class Provider extends PacketExtensionProvider<RoomInvitation> {
public static class Provider extends ExtensionElementProvider<RoomInvitation> {
@Override
public RoomInvitation parse(XmlPullParser parser,

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
View file

@ -20,9 +20,9 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Gaston Dombiak
*/
public class RoomTransfer implements PacketExtension {
public class RoomTransfer implements ExtensionElement {
/**
* Element name of the packet extension.
@ -158,7 +158,7 @@ public class RoomTransfer implements PacketExtension {
}
}
public static class Provider extends PacketExtensionProvider<RoomTransfer> {
public static class Provider extends ExtensionElementProvider<RoomTransfer> {
@Override
public RoomTransfer parse(XmlPullParser parser,

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
View file

@ -19,12 +19,12 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class SessionID implements PacketExtension {
public class SessionID implements ExtensionElement {
/**
* Element name of the packet extension.
@ -64,7 +64,7 @@ public class SessionID implements PacketExtension {
return buf.toString();
}
public static class Provider extends PacketExtensionProvider<SessionID> {
public static class Provider extends ExtensionElementProvider<SessionID> {
@Override
public SessionID parse(XmlPullParser parser, int initialDepth)

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
View file

@ -64,7 +64,7 @@ public class TranscriptSearch extends SimpleIQ {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
// Parse the packet extension
PacketParserUtils.addPacketExtension(answer, parser);
PacketParserUtils.addExtensionElement(answer, parser);
}
else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals(ELEMENT_NAME)) {

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
View file

@ -19,14 +19,14 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
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.smack.util.ParserUtils;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class UserID implements PacketExtension {
public class UserID implements ExtensionElement {
/**
* Element name of the packet extension.
@ -66,7 +66,7 @@ public class UserID implements PacketExtension {
return buf.toString();
}
public static class Provider extends PacketExtensionProvider<UserID> {
public static class Provider extends ExtensionElementProvider<UserID> {
@Override
public UserID parse(XmlPullParser parser, int initialDepth)

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
View file

@ -19,8 +19,8 @@ package org.jivesoftware.smackx.workgroup.packet;
import java.io.IOException;
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.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -28,7 +28,7 @@ import org.xmlpull.v1.XmlPullParserException;
* A packet extension that contains information about the user and agent in a
* workgroup chat. The packet extension is attached to group chat invitations.
*/
public class WorkgroupInformation implements PacketExtension {
public class WorkgroupInformation implements ExtensionElement {
/**
* Element name of the packet extension.
@ -68,7 +68,7 @@ public class WorkgroupInformation implements PacketExtension {
return buf.toString();
}
public static class Provider extends PacketExtensionProvider<WorkgroupInformation> {
public static class Provider extends ExtensionElementProvider<WorkgroupInformation> {
/**
* PacketExtensionProvider implementation

20
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
View file

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.SmackException.NotConnectedException;
@ -31,12 +31,12 @@ import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.FromMatchesFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.filter.StanzaTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
@ -141,9 +141,9 @@ public class Workgroup {
});
// Register a packet listener for all the messages sent to this client.
PacketFilter typeFilter = new PacketTypeFilter(Message.class);
StanzaFilter typeFilter = new StanzaTypeFilter(Message.class);
connection.addAsyncPacketListener(new PacketListener() {
connection.addAsyncStanzaListener(new StanzaListener() {
public void processPacket(Stanza packet) {
handlePacket(packet);
}
@ -181,8 +181,8 @@ public class Workgroup {
public boolean isAvailable() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
Presence directedPresence = new Presence(Presence.Type.available);
directedPresence.setTo(workgroupJID);
PacketFilter typeFilter = new PacketTypeFilter(Presence.class);
PacketFilter fromFilter = FromMatchesFilter.create(workgroupJID);
StanzaFilter typeFilter = new StanzaTypeFilter(Presence.class);
StanzaFilter fromFilter = FromMatchesFilter.create(workgroupJID);
PacketCollector collector = connection.createPacketCollectorAndSend(new AndFilter(fromFilter,
typeFilter), directedPresence);
@ -503,8 +503,8 @@ public class Workgroup {
if (packet instanceof Message) {
Message msg = (Message)packet;
// Check to see if the user left the queue.
PacketExtension pe = msg.getExtension("depart-queue", "http://jabber.org/protocol/workgroup");
PacketExtension queueStatus = msg.getExtension("queue-status", "http://jabber.org/protocol/workgroup");
ExtensionElement pe = msg.getExtension("depart-queue", "http://jabber.org/protocol/workgroup");
ExtensionElement queueStatus = msg.getExtension("queue-status", "http://jabber.org/protocol/workgroup");
if (pe != null) {
fireQueueDepartedEvent();

18
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
View file

@ -26,14 +26,14 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.MessageTypeFilter;
import org.jivesoftware.smack.filter.NotFilter;
import org.jivesoftware.smack.filter.PacketExtensionFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaExtensionFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smackx.xevent.packet.MessageEvent;
@ -53,7 +53,7 @@ public class MessageEventManager extends Manager {
private static final Map<XMPPConnection, MessageEventManager> INSTANCES = new WeakHashMap<>();
private static final PacketFilter PACKET_FILTER = new AndFilter(new PacketExtensionFilter(
private static final StanzaFilter PACKET_FILTER = new AndFilter(new StanzaExtensionFilter(
new MessageEvent()), new NotFilter(MessageTypeFilter.ERROR));
private List<MessageEventNotificationListener> messageEventNotificationListeners = new CopyOnWriteArrayList<MessageEventNotificationListener>();
@ -76,7 +76,7 @@ public class MessageEventManager extends Manager {
private MessageEventManager(XMPPConnection connection) {
super(connection);
// Listens for all message event packets and fire the proper message event listeners.
connection.addAsyncPacketListener(new PacketListener() {
connection.addAsyncStanzaListener(new StanzaListener() {
public void processPacket(Stanza packet) {
Message message = (Message) packet;
MessageEvent messageEvent =
@ -220,7 +220,7 @@ public class MessageEventManager extends Manager {
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
connection().sendStanza(msg);
}
/**
@ -240,7 +240,7 @@ public class MessageEventManager extends Manager {
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
connection().sendStanza(msg);
}
/**
@ -260,7 +260,7 @@ public class MessageEventManager extends Manager {
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
connection().sendStanza(msg);
}
/**
@ -280,6 +280,6 @@ public class MessageEventManager extends Manager {
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
connection().sendStanza(msg);
}
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smackx.xevent.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import java.util.ArrayList;
import java.util.List;
@ -53,7 +53,7 @@ import java.util.List;
*
* @author Gaston Dombiak
*/
public class MessageEvent implements PacketExtension {
public class MessageEvent implements ExtensionElement {
public static final String NAMESPACE = "jabber:x:event";
public static final String ELEMENT = "x";

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
View file

@ -19,7 +19,7 @@ package org.jivesoftware.smackx.xevent.provider;
import java.io.IOException;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.xevent.packet.MessageEvent;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Gaston Dombiak
*/
public class MessageEventProvider extends PacketExtensionProvider<MessageEvent> {
public class MessageEventProvider extends ExtensionElementProvider<MessageEvent> {
/**
* Parses a MessageEvent packet (extension sub-packet).

20
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
View file

@ -24,11 +24,11 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.StanzaListener;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.PacketExtensionFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaExtensionFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.roster.Roster;
@ -53,12 +53,12 @@ public class RosterExchangeManager {
private final static Map<XMPPConnection, RosterExchangeManager> INSTANCES = new WeakHashMap<>();
private final static PacketFilter PACKET_FILTER = new PacketExtensionFilter(ELEMENT, NAMESPACE);
private final static StanzaFilter PACKET_FILTER = new StanzaExtensionFilter(ELEMENT, NAMESPACE);
private final Set<RosterExchangeListener> rosterExchangeListeners = Collections.synchronizedSet(new HashSet<RosterExchangeListener>());
private final WeakReference<XMPPConnection> weakRefConnection;
private final PacketListener packetListener;
private final StanzaListener packetListener;
public synchronized static RosterExchangeManager getInstanceFor(XMPPConnection connection) {
RosterExchangeManager rosterExchangeManager = INSTANCES.get(connection);
@ -77,7 +77,7 @@ public class RosterExchangeManager {
public RosterExchangeManager(XMPPConnection connection) {
weakRefConnection = new WeakReference<XMPPConnection>(connection);
// Listens for all roster exchange packets and fire the roster exchange listeners.
packetListener = new PacketListener() {
packetListener = new StanzaListener() {
public void processPacket(Stanza packet) {
Message message = (Message) packet;
RosterExchange rosterExchange =
@ -86,7 +86,7 @@ public class RosterExchangeManager {
fireRosterExchangeListeners(message.getFrom(), rosterExchange.getRosterEntries());
}
};
connection.addAsyncPacketListener(packetListener, PACKET_FILTER);
connection.addAsyncStanzaListener(packetListener, PACKET_FILTER);
}
/**
@ -127,7 +127,7 @@ public class RosterExchangeManager {
XMPPConnection connection = weakRefConnection.get();
// Send the message that contains the roster
connection.sendPacket(msg);
connection.sendStanza(msg);
}
/**
@ -148,7 +148,7 @@ public class RosterExchangeManager {
XMPPConnection connection = weakRefConnection.get();
// Send the message that contains the roster
connection.sendPacket(msg);
connection.sendStanza(msg);
}
/**
@ -172,7 +172,7 @@ public class RosterExchangeManager {
XMPPConnection connection = weakRefConnection.get();
// Send the message that contains the roster
connection.sendPacket(msg);
connection.sendStanza(msg);
}
/**

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smackx.xroster.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.roster.Roster;
import org.jivesoftware.smack.roster.RosterEntry;
import org.jivesoftware.smack.roster.RosterGroup;
@ -48,7 +48,7 @@ import java.util.List;
*
* @author Gaston Dombiak
*/
public class RosterExchange implements PacketExtension {
public class RosterExchange implements ExtensionElement {
private List<RemoteRosterEntry> remoteRosterEntries = new ArrayList<RemoteRosterEntry>();

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
View file

@ -20,7 +20,7 @@ package org.jivesoftware.smackx.xroster.provider;
import java.io.IOException;
import java.util.ArrayList;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smackx.xroster.RemoteRosterEntry;
import org.jivesoftware.smackx.xroster.packet.RosterExchange;
@ -34,7 +34,7 @@ import org.xmlpull.v1.XmlPullParserException;
*
* @author Gaston Dombiak
*/
public class RosterExchangeProvider extends PacketExtensionProvider<RosterExchange> {
public class RosterExchangeProvider extends ExtensionElementProvider<RosterExchange> {
/**
* Parses a RosterExchange packet (extension sub-packet).