Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-16 21:51:13 (GMT) |
|---|---|---|
| committer | Nick Hudson <nick.hudson@isode.com> | 2015-07-28 10:41:23 (GMT) |
| commit | 6f84f6a65b8b80e2f599dff76da0cd13fbead611 (patch) | |
| tree | 9a4b503a82d58cfc4884817945fcd26a0c0f9ba4 /src/com/isode/stroke/serializer/XMPPSerializer.java | |
| parent | 9a419f5fff0701e672e241a515ce3e91438b3e1b (diff) | |
| download | stroke-6f84f6a65b8b80e2f599dff76da0cd13fbead611.zip stroke-6f84f6a65b8b80e2f599dff76da0cd13fbead611.tar.bz2 | |
Update Serializers and Parsers.
Updates Serializers and Parsers along with one minor change in XMPPlayer.
Update Non Payload Serializers to return SafeByteArray.
Updates SafeByteArray to return SafeByteArray on append and plus method.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
None.
Change-Id: I6fe665a26b10cac37b3e3acd9ec15c211ac9b8ab
Diffstat (limited to 'src/com/isode/stroke/serializer/XMPPSerializer.java')
| -rw-r--r-- | src/com/isode/stroke/serializer/XMPPSerializer.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/isode/stroke/serializer/XMPPSerializer.java b/src/com/isode/stroke/serializer/XMPPSerializer.java index 2bf996b..cd7a4cd 100644 --- a/src/com/isode/stroke/serializer/XMPPSerializer.java +++ b/src/com/isode/stroke/serializer/XMPPSerializer.java @@ -12,17 +12,18 @@ import com.isode.stroke.elements.Element; import com.isode.stroke.elements.ProtocolHeader; import com.isode.stroke.elements.StreamType; import java.util.Vector; +import com.isode.stroke.base.SafeByteArray; public class XMPPSerializer { private final Vector<ElementSerializer> serializers_ = new Vector<ElementSerializer>(); private final StreamType type_; - public XMPPSerializer(PayloadSerializerCollection payloadSerializers, StreamType type) { + public XMPPSerializer(PayloadSerializerCollection payloadSerializers, StreamType type, boolean setExplictNSonTopLevelElements) { type_ = type; - serializers_.add(new PresenceSerializer(payloadSerializers)); - serializers_.add(new IQSerializer(payloadSerializers)); - serializers_.add(new MessageSerializer(payloadSerializers)); + serializers_.add(new PresenceSerializer(payloadSerializers, setExplictNSonTopLevelElements ? getDefaultNamespace() : null)); + serializers_.add(new IQSerializer(payloadSerializers, setExplictNSonTopLevelElements ? getDefaultNamespace() : null)); + serializers_.add(new MessageSerializer(payloadSerializers, setExplictNSonTopLevelElements ? getDefaultNamespace() : null)); serializers_.add(new CompressRequestSerializer()); serializers_.add(new CompressFailureSerializer()); serializers_.add(new AuthRequestSerializer()); @@ -33,8 +34,8 @@ public class XMPPSerializer { serializers_.add(new StartTLSRequestSerializer()); serializers_.add(new StartTLSFailureSerializer()); serializers_.add(new TLSProceedSerializer()); - //serializers_.add(new StreamFeaturesSerializer()); //TODO: Port - //serializers_.add(new StreamErrorSerializer()); //FIXME!!!: Port + serializers_.add(new StreamFeaturesSerializer()); + serializers_.add(new StreamErrorSerializer()); serializers_.add(new EnableStreamManagementSerializer()); serializers_.add(new StreamManagementEnabledSerializer()); serializers_.add(new StreamManagementFailedSerializer()); @@ -42,7 +43,7 @@ public class XMPPSerializer { serializers_.add(new StreamResumedSerializer()); serializers_.add(new StanzaAckSerializer()); serializers_.add(new StanzaAckRequestSerializer()); - //serializers_.add(new ComponentHandshakeSerializer()); + serializers_.add(new ComponentHandshakeSerializer()); } public String serializeHeader(ProtocolHeader header) { @@ -80,7 +81,7 @@ public class XMPPSerializer { return ""; } - public String serializeElement(Element element) { + public SafeByteArray serializeElement(Element element) { for (ElementSerializer serializer : serializers_) { if (serializer.canSerialize(element)) { return serializer.serialize(element); |