Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 08:12:05 +01:00
Code Issues Releases Wiki Activity

Add support for (custom) data form extensions

Browse source 
Fixes SMACK-605
This commit is contained in:
Florian Schmaus 2014-09-12 13:43:04 +02:00
parent d57fecfcc9
commit 9016120d71
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -609,7 +609,7 @@ public class PacketParserUtils {
return iqPacket; return iqPacket;
} }
private static RosterPacket parseRoster(XmlPullParser parser) throws Exception { public static RosterPacket parseRoster(XmlPullParser parser) throws Exception {
RosterPacket roster = new RosterPacket(); RosterPacket roster = new RosterPacket();
boolean done = false; boolean done = false;
RosterPacket.Item item = null; RosterPacket.Item item = null;

13
smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
View file

@ -17,6 +17,7 @@
package org.jivesoftware.smackx.xdata.packet; package org.jivesoftware.smackx.xdata.packet;
import org.jivesoftware.smack.packet.Element;
import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.FormField;
@ -42,6 +43,7 @@ public class DataForm implements PacketExtension {
private ReportedData reportedData; private ReportedData reportedData;
private final List<Item> items = new ArrayList<Item>(); private final List<Item> items = new ArrayList<Item>();
private final List<FormField> fields = new ArrayList<FormField>(); private final List<FormField> fields = new ArrayList<FormField>();
private final List<Element> extensionElements = new ArrayList<Element>();
public DataForm(String type) { public DataForm(String type) {
this.type = type; this.type = type;
@ -195,6 +197,14 @@ public class DataForm implements PacketExtension {
} }
} }
public void addExtensionElement(Element element) {
extensionElements.add(element);
}
public List<Element> getExtensionElements() {
return Collections.unmodifiableList(extensionElements);
}
/** /**
* Returns true if this DataForm has at least one FORM_TYPE field which is * Returns true if this DataForm has at least one FORM_TYPE field which is
* hidden. This method is used for sanity checks. * hidden. This method is used for sanity checks.
@ -232,6 +242,9 @@ public class DataForm implements PacketExtension {
for (FormField field : getFields()) { for (FormField field : getFields()) {
buf.append(field.toXML()); buf.append(field.toXML());
} }
for (Element element : extensionElements) {
buf.append(element.toXML());
}
buf.closeElement(this); buf.closeElement(this);
return buf; return buf;
} }

6
smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
View file

@ -18,7 +18,9 @@
package org.jivesoftware.smackx.xdata.provider; package org.jivesoftware.smackx.xdata.provider;
import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.FormField;
import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jivesoftware.smackx.xdata.packet.DataForm;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
@ -61,6 +63,10 @@ public class DataFormProvider implements PacketExtensionProvider {
else if (parser.getName().equals("reported")) { else if (parser.getName().equals("reported")) {
dataForm.setReportedData(parseReported(parser)); dataForm.setReportedData(parseReported(parser));
} }
// See XEP-133 Example 32 for a corner case where the data form contains this extension.
else if (parser.getName().equals(RosterPacket.ELEMENT) && parser.getNamespace().equals(RosterPacket.NAMESPACE)) {
dataForm.addExtensionElement(PacketParserUtils.parseRoster(parser));
}
} else if (eventType == XmlPullParser.END_TAG) { } else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals(dataForm.getElementName())) { if (parser.getName().equals(dataForm.getElementName())) {
done = true; done = true;