Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +02:00
Code Issues Releases Wiki Activity

Add 'PacketParserUtils.addPacketextension()'

Browse source
This commit is contained in:
Florian Schmaus 2014-10-07 21:46:02 +02:00
parent 6980c8e63d
commit 452b2aca0f
9 changed files with 52 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java
View file

@ -102,8 +102,8 @@ abstract public class EmbeddedExtensionProvider<PE extends PacketExtension> exte
{
tag = parser.next();
if (tag == XmlPullParser.START_TAG)
extensions.add(PacketParserUtils.parsePacketExtension(parser.getName(), parser.getNamespace(), parser));
if (tag == XmlPullParser.START_TAG)
PacketParserUtils.addPacketExtension(extensions, parser);
} while (!(tag == XmlPullParser.END_TAG && parser.getDepth() == initialDepth));
return createReturnExtension(name, namespace, attMap, extensions);

62
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -245,8 +245,7 @@ public class PacketParserUtils {
message.setError(parseError(parser));
break;
default:
message.addExtension(
PacketParserUtils.parsePacketExtension(elementName, namespace, parser));
PacketParserUtils.addPacketExtension(message, parser, elementName, namespace);
break;
}
break;
@ -504,15 +503,12 @@ public class PacketParserUtils {
// Otherwise, it must be a packet extension.
// Be extra robust: Skip PacketExtensions that cause Exceptions, instead of
// failing completely here. See SMACK-390 for more information.
try {
presence.addExtension(PacketParserUtils.parsePacketExtension(elementName, namespace, parser));
}
catch (Exception e) {
LOGGER.log(Level.WARNING,
"Failed to parse extension packet in Presence packet.",
e);
}
break;
try {
PacketParserUtils.addPacketExtension(presence, parser, elementName, namespace);
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Failed to parse extension packet in Presence packet.", e);
}
break;
}
case XmlPullParser.END_TAG:
if (parser.getDepth() == initialDepth) {
@ -871,8 +867,8 @@ public class PacketParserUtils {
if (namespace.equals(XMPPError.NAMESPACE)) {
condition = elementName;
}
else {
extensions.add(parsePacketExtension(elementName, namespace, parser));
else {
PacketParserUtils.addPacketExtension(extensions, parser, elementName, namespace);
}
}
}
@ -906,6 +902,7 @@ public class PacketParserUtils {
public static PacketExtension parsePacketExtension(String elementName, String namespace,
XmlPullParser parser) throws XmlPullParserException,
IOException, SmackException {
ParserUtils.assertAtStartTag(parser);
// See if a provider is registered to handle the extension.
PacketExtensionProvider<PacketExtension> provider = ProviderManager.getExtensionProvider(elementName, namespace);
if (provider != null) {
@ -923,12 +920,14 @@ public class PacketParserUtils {
throw new SmackException(e);
}
}
final int initialDepth = parser.getDepth();
// No providers registered, so use a default extension.
DefaultPacketExtension extension = new DefaultPacketExtension(elementName, namespace);
boolean done = false;
while (!done) {
outerloop: while (true) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
switch (eventType) {
case XmlPullParser.START_TAG:
String name = parser.getName();
// If an empty element, set the value with the empty string.
if (parser.isEmptyElementTag()) {
@ -942,10 +941,10 @@ public class PacketParserUtils {
extension.setValue(name, value);
}
}
}
else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals(elementName)) {
done = true;
break;
case XmlPullParser.END_TAG:
if (parser.getDepth() == initialDepth) {
break outerloop;
}
}
}
@ -1022,6 +1021,29 @@ public class PacketParserUtils {
return object;
}
public static void addPacketExtension(Packet packet, XmlPullParser parser) throws XmlPullParserException,
IOException, SmackException {
ParserUtils.assertAtStartTag(parser);
addPacketExtension(packet, parser, parser.getName(), parser.getNamespace());
}
public static void addPacketExtension(Packet packet, XmlPullParser parser, String elementName, String namespace)
throws XmlPullParserException, IOException, SmackException {
PacketExtension packetExtension = parsePacketExtension(elementName, namespace, parser);
packet.addExtension(packetExtension);
}
public static void addPacketExtension(Collection<PacketExtension> collection, XmlPullParser parser)
throws XmlPullParserException, IOException, SmackException {
addPacketExtension(collection, parser, parser.getName(), parser.getNamespace());
}
public static void addPacketExtension(Collection<PacketExtension> collection, XmlPullParser parser,
String elementName, String namespace) throws XmlPullParserException, IOException, SmackException {
PacketExtension packetExtension = parsePacketExtension(elementName, namespace, parser);
collection.add(packetExtension);
}
/**
* Decodes a String into an object of the specified type. If the object
* type is not supported, null will be returned.