Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-01-12 16:48:02 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-01-16 15:54:31 (GMT) |
| commit | 839db071f46d083b86996f514f5fe0f2d6aee80a (patch) | |
| tree | 9f14beb42dcd82fa4deba10f516a0ba0368e57b5 /src/com/isode/stroke/serializer | |
| parent | 3adee817bfcbd54fd13c4d946bedadeca661e9b1 (diff) | |
| download | stroke-839db071f46d083b86996f514f5fe0f2d6aee80a.zip stroke-839db071f46d083b86996f514f5fe0f2d6aee80a.tar.bz2 | |
Add support for DiscoItems and DiscoInfo.
Updates requisite classes in line with Swiften.
Also fixes bugs in the EventLoops not using handleEvent.
Diffstat (limited to 'src/com/isode/stroke/serializer')
3 files changed, 93 insertions, 2 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/DiscoInfoSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/DiscoInfoSerializer.java new file mode 100644 index 0000000..563eb53 --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/DiscoInfoSerializer.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2012, Isode Limited, London, England. + * All rights reserved. + */ +/* + * Copyright (c) 2010, Remko Tronçon. + * All rights reserved. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import com.isode.stroke.elements.DiscoInfo; +import com.isode.stroke.elements.Form; +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.serializer.xml.XMLElement; +import com.isode.stroke.serializer.xml.XMLRawTextNode; + +class DiscoInfoSerializer extends GenericPayloadSerializer<DiscoInfo>{ + + public DiscoInfoSerializer() { + super(DiscoInfo.class); + } + + @Override + protected String serializePayload(DiscoInfo discoInfo) { + XMLElement queryElement = new XMLElement("query", "http://jabber.org/protocol/disco#info"); + if (!discoInfo.getNode().isEmpty()) { + queryElement.setAttribute("node", discoInfo.getNode()); + } + for (DiscoInfo.Identity identity : discoInfo.getIdentities()) { + XMLElement identityElement = new XMLElement("identity"); + if (!identity.getLanguage().isEmpty()) { + identityElement.setAttribute("xml:lang", identity.getLanguage()); + } + identityElement.setAttribute("category", identity.getCategory()); + identityElement.setAttribute("name", identity.getName()); + identityElement.setAttribute("type", identity.getType()); + queryElement.addNode(identityElement); + } + for (String feature : discoInfo.getFeatures()) { + XMLElement featureElement = new XMLElement("feature"); + featureElement.setAttribute("var", feature); + queryElement.addNode(featureElement); + } + for (Form extension : discoInfo.getExtensions()) { + queryElement.addNode(new XMLRawTextNode(new FormSerializer().serialize(extension))); + } + return queryElement.serialize(); + } + +} diff --git a/src/com/isode/stroke/serializer/payloadserializers/DiscoItemsSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/DiscoItemsSerializer.java new file mode 100644 index 0000000..8d89d98 --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/DiscoItemsSerializer.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2012, Isode Limited, London, England. + * All rights reserved. + */ +/* + * Copyright (c) 2010, Kevin Smith. + * All rights reserved. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import com.isode.stroke.elements.DiscoItems; +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.serializer.xml.XMLElement; + +class DiscoItemsSerializer extends GenericPayloadSerializer<DiscoItems> { + + public DiscoItemsSerializer() { + super(DiscoItems.class); + } + + @Override + protected String serializePayload(DiscoItems discoItems) { + XMLElement queryElement = new XMLElement("query", "http://jabber.org/protocol/disco#items"); + if (!discoItems.getNode().isEmpty()) { + queryElement.setAttribute("node", discoItems.getNode()); + } + for (DiscoItems.Item item : discoItems.getItems()) { + XMLElement itemElement = new XMLElement("item"); + itemElement.setAttribute("name", item.getName()); + itemElement.setAttribute("jid", item.getJID().toString()); + if (!item.getNode().isEmpty()) { + itemElement.setAttribute("node", item.getNode()); + } + queryElement.addNode(itemElement); + } + return queryElement.serialize(); + } + +} diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java index f43a47e..4051d9b 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java @@ -27,8 +27,8 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection addSerializer(new SoftwareVersionSerializer()); //addSerializer(new StatusSerializer()); //addSerializer(new StatusShowSerializer()); - //addSerializer(new DiscoInfoSerializer()); - //addSerializer(new DiscoItemsSerializer()); + addSerializer(new DiscoInfoSerializer()); + addSerializer(new DiscoItemsSerializer()); //addSerializer(new CapsInfoSerializer()); addSerializer(new ResourceBindSerializer()); addSerializer(new StartSessionSerializer()); |