Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-05-11 15:38:57 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-06-14 20:28:20 (GMT) |
| commit | 9b1c1ec6922047fa30c19c0744619dc458a12b78 (patch) | |
| tree | 230a96de2a104324b8ab179834a7b9914c0443f9 /Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp | |
| parent | 0d5dcec01a396ab64c559a5b0cd04eb38f2f1954 (diff) | |
| download | swift-9b1c1ec6922047fa30c19c0744619dc458a12b78.zip swift-9b1c1ec6922047fa30c19c0744619dc458a12b78.tar.bz2 | |
Fix handling of notify attribute in PubSub retract elements
Test-Information:
Added serializer and parser unit tests. All tests pass on
Mac OS X 10.11.4.
Change-Id: I8550c76ba182a67613d55634c72c0f2979f8b80a
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp index 752c234..99b425e 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp @@ -4,15 +4,14 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> + #include <memory> -#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Base/foreach.h> +#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h> +#include <Swiften/Serializer/XML/XMLElement.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> using namespace Swift; @@ -32,7 +31,9 @@ std::string PubSubRetractSerializer::serializePayload(std::shared_ptr<PubSubRetr foreach(std::shared_ptr<PubSubItem> item, payload->getItems()) { element.addNode(std::make_shared<XMLRawTextNode>(PubSubItemSerializer(serializers).serialize(item))); } - element.setAttribute("notify", payload->isNotify() ? "true" : "false"); + if (payload->isNotify().is_initialized()) { + element.setAttribute("notify", payload->isNotify().get() ? "true" : "false"); + } return element.serialize(); } |