Swiftdiff options
Diffstat (limited to 'src/com/isode/stroke/serializer')
6 files changed, 83 insertions, 5 deletions
diff --git a/src/com/isode/stroke/serializer/AuthRequestSerializer.java b/src/com/isode/stroke/serializer/AuthRequestSerializer.java index 2eaed47..318eab8 100644 --- a/src/com/isode/stroke/serializer/AuthRequestSerializer.java +++ b/src/com/isode/stroke/serializer/AuthRequestSerializer.java @@ -35,4 +35,4 @@ class AuthRequestSerializer extends GenericElementSerializer<AuthRequest> { return "<auth xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\" mechanism=\"" + authRequest.getMechanism() + "\">" + value + "</auth>"; } -} +}
\ No newline at end of file diff --git a/src/com/isode/stroke/serializer/AuthResponseSerializer.java b/src/com/isode/stroke/serializer/AuthResponseSerializer.java index 8deb9b8..97bf91a 100644 --- a/src/com/isode/stroke/serializer/AuthResponseSerializer.java +++ b/src/com/isode/stroke/serializer/AuthResponseSerializer.java @@ -25,7 +25,7 @@ class AuthResponseSerializer extends GenericElementSerializer<AuthResponse> { ByteArray message = authResponse.getValue(); if (message != null) { if (message.isEmpty()) { - value = "="; + value = ""; } else { value = Base64.encode(message); } diff --git a/src/com/isode/stroke/serializer/StreamFeaturesSerializer.java b/src/com/isode/stroke/serializer/StreamFeaturesSerializer.java new file mode 100644 index 0000000..b5eb598 --- /dev/null +++ b/src/com/isode/stroke/serializer/StreamFeaturesSerializer.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.serializer; + +import com.isode.stroke.serializer.GenericElementSerializer; +import com.isode.stroke.serializer.xml.XMLElement; +import com.isode.stroke.serializer.xml.XMLTextNode; +import com.isode.stroke.elements.StreamFeatures; +import com.isode.stroke.elements.Element; + +public class StreamFeaturesSerializer extends GenericElementSerializer<StreamFeatures> { + + public StreamFeaturesSerializer() { + super(StreamFeatures.class); + } + + public String serialize(Element element) { + StreamFeatures streamFeatures = (StreamFeatures)(element); + + XMLElement streamFeaturesElement = new XMLElement("stream:features"); + if (streamFeatures.hasStartTLS()) { + streamFeaturesElement.addNode(new XMLElement("starttls", "urn:ietf:params:xml:ns:xmpp-tls")); + } + if (!streamFeatures.getCompressionMethods().isEmpty()) { + XMLElement compressionElement = new XMLElement("compression", "http://jabber.org/features/compress"); + for(String method : streamFeatures.getCompressionMethods()) { + XMLElement methodElement = new XMLElement("method"); + methodElement.addNode(new XMLTextNode(method)); + compressionElement.addNode(methodElement); + } + streamFeaturesElement.addNode(compressionElement); + } + if (!streamFeatures.getAuthenticationMechanisms().isEmpty()) { + XMLElement mechanismsElement = new XMLElement("mechanisms", "urn:ietf:params:xml:ns:xmpp-sasl"); + for(String mechanism : streamFeatures.getAuthenticationMechanisms()) { + XMLElement mechanismElement = new XMLElement("mechanism"); + mechanismElement.addNode(new XMLTextNode(mechanism)); + mechanismsElement.addNode(mechanismElement); + } + streamFeaturesElement.addNode(mechanismsElement); + } + if (streamFeatures.hasResourceBind()) { + streamFeaturesElement.addNode(new XMLElement("bind", "urn:ietf:params:xml:ns:xmpp-bind")); + } + if (streamFeatures.hasSession()) { + streamFeaturesElement.addNode(new XMLElement("session", "urn:ietf:params:xml:ns:xmpp-session")); + } + if (streamFeatures.hasStreamManagement()) { + streamFeaturesElement.addNode(new XMLElement("sm", "urn:xmpp:sm:2")); + } + if (streamFeatures.hasRosterVersioning()) { + streamFeaturesElement.addNode(new XMLElement("ver", "urn:xmpp:features:rosterver")); + } + return streamFeaturesElement.serialize(); + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java index f54f38f..38e1eba 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java +++ b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java @@ -25,7 +25,8 @@ public class DelaySerializer extends GenericPayloadSerializer<Delay> { if (delay.getFrom() != null && delay.getFrom().isValid()) { delayElement.setAttribute("from", delay.getFrom().toString()); } - delayElement.setAttribute("stamp", DateTime.dateToString(delay.getStamp())); + if(delay.getStamp() != null) + delayElement.setAttribute("stamp", DateTime.dateToString(delay.getStamp())); return delayElement.serialize(); } } diff --git a/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java index 33d064d..47373f8 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java +++ b/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java @@ -12,11 +12,16 @@ package com.isode.stroke.serializer.payloadserializers; import com.isode.stroke.elements.ErrorPayload; import com.isode.stroke.serializer.GenericPayloadSerializer; import com.isode.stroke.serializer.xml.XMLTextNode; +import com.isode.stroke.serializer.PayloadSerializerCollection; +import com.isode.stroke.serializer.PayloadSerializer; class ErrorSerializer extends GenericPayloadSerializer<ErrorPayload> { - public ErrorSerializer() { + private PayloadSerializerCollection serializers; + + public ErrorSerializer(PayloadSerializerCollection serializers) { super(ErrorPayload.class); + this.serializers = serializers; } @Override @@ -63,6 +68,13 @@ class ErrorSerializer extends GenericPayloadSerializer<ErrorPayload> { result += "<text xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">" + textNode.serialize() + "</text>"; } + if (error.getPayload() != null) { + PayloadSerializer serializer = serializers.getPayloadSerializer(error.getPayload()); + if (serializer != null) { + result += serializer.serialize(error.getPayload()); + } + } + result += "</error>"; return result; } diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java index 001d126..ac093c0 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java @@ -26,7 +26,7 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection addSerializer(new CarbonsReceivedSerializer(this)); addSerializer(new CarbonsSentSerializer(this)); addSerializer(new PrioritySerializer()); - addSerializer(new ErrorSerializer()); + addSerializer(new ErrorSerializer(this)); addSerializer(new InBandRegistrationPayloadSerializer()); addSerializer(new IBBSerializer()); addSerializer(new JingleIBBTransportPayloadSerializer()); |