4 files changed, 128 insertions, 0 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index 4c3cf66..9832bd5 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -22,60 +22,61 @@
 #include <Swiften/Serializer/PayloadSerializers/ChatStateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CommandSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DelaySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DeliveryReceiptSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/DiscoItemsSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ErrorSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IBBSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IdleSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/LastSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXParticipantSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCAdminPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/NicknameSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PrioritySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PrivateStorageSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RawXMLPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ResourceBindSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/RosterSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/SoftwareVersionSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StatusSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StatusShowSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StorageSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.h>
@@ -133,58 +134,59 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
     serializers_.push_back(new NicknameSerializer());
     serializers_.push_back(new SearchPayloadSerializer());
     serializers_.push_back(new ReplaceSerializer());
     serializers_.push_back(new LastSerializer());
     serializers_.push_back(new WhiteboardSerializer());
     serializers_.push_back(new UserLocationSerializer(this));
     serializers_.push_back(new UserTuneSerializer(this));
     serializers_.push_back(new IdleSerializer());
 
     serializers_.push_back(new StreamInitiationFileInfoSerializer());
     serializers_.push_back(new JingleFileTransferFileInfoSerializer());
     serializers_.push_back(new JingleContentPayloadSerializer());
     serializers_.push_back(new JingleFileTransferDescriptionSerializer());
     serializers_.push_back(new JingleFileTransferHashSerializer());
     serializers_.push_back(new JingleIBBTransportPayloadSerializer());
     serializers_.push_back(new JingleS5BTransportPayloadSerializer());
     serializers_.push_back(new JinglePayloadSerializer(this));
     serializers_.push_back(new S5BProxyRequestSerializer());
     serializers_.push_back(new DeliveryReceiptSerializer());
     serializers_.push_back(new DeliveryReceiptRequestSerializer());
 
     serializers_.push_back(new PubSubSerializer(this));
     serializers_.push_back(new PubSubEventSerializer(this));
     serializers_.push_back(new PubSubOwnerPubSubSerializer(this));
     serializers_.push_back(new PubSubErrorSerializer());
 
     serializers_.push_back(new ResultSetSerializer());
     serializers_.push_back(new ForwardedSerializer(this));
     serializers_.push_back(new MIXParticipantSerializer());
     serializers_.push_back(new MIXCreateSerializer());
+    serializers_.push_back(new MIXUserPreferenceSerializer());
     serializers_.push_back(new MIXJoinSerializer());
     serializers_.push_back(new MIXDestroySerializer());
     serializers_.push_back(new MAMResultSerializer(this));
     serializers_.push_back(new MAMQuerySerializer());
     serializers_.push_back(new MAMFinSerializer());
 
     serializers_.push_back(new CarbonsDisableSerializer());
     serializers_.push_back(new CarbonsEnableSerializer());
     serializers_.push_back(new CarbonsPrivateSerializer());
     serializers_.push_back(new CarbonsReceivedSerializer(this));
     serializers_.push_back(new CarbonsSentSerializer(this));
 
     serializers_.push_back(new IsodeIQDelegationSerializer(this));
 
     for (auto serializer : serializers_) {
         addSerializer(serializer);
     }
 }
 
 FullPayloadSerializerCollection::~FullPayloadSerializerCollection() {
     for (auto serializer : serializers_) {
         removeSerializer(serializer);
         delete serializer;
     }
     serializers_.clear();
 }
 
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp
new file mode 100644
index 0000000..2d057ad
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h>
+
+#include <memory>
+
+#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
+#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+
+namespace Swift {
+
+MIXUserPreferenceSerializer::MIXUserPreferenceSerializer() {
+}
+
+MIXUserPreferenceSerializer::~MIXUserPreferenceSerializer() {
+}
+
+std::string MIXUserPreferenceSerializer::serializePayload(std::shared_ptr<MIXUserPreference> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("user-preference", "urn:xmpp:mix:1");
+    if(payload->getData()) {
+        element.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getData())));
+    }
+    return element.serialize();
+}
+}
diff --git a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h
new file mode 100644
index 0000000..301083a
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/MIXUserPreference.h>
+#include <Swiften/Serializer/GenericPayloadSerializer.h>
+
+namespace Swift {
+
+    class SWIFTEN_API MIXUserPreferenceSerializer : public GenericPayloadSerializer<MIXUserPreference> {
+        public:
+            MIXUserPreferenceSerializer();
+            virtual ~MIXUserPreferenceSerializer();
+
+            virtual std::string serializePayload(std::shared_ptr<MIXUserPreference>) const SWIFTEN_OVERRIDE;
+    };
+}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp
new file mode 100644
index 0000000..7cbfbfc
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <gtest/gtest.h>
+
+#include <Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
+
+using namespace Swift;
+
+TEST(MIXUserPreferenceSerializerTest, XEP0369_Example31) {
+    MIXUserPreferenceSerializer testling;
+
+    auto userpreference = std::shared_ptr<MIXUserPreference>(new MIXUserPreference());
+    std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:1\"/>";
+    ASSERT_EQ(expectedResult, testling.serialize(userpreference));
+}
+
+TEST(MIXUserPreferenceSerializerTest, XEP0369_Example32) {
+    MIXUserPreferenceSerializer testling;
+
+    auto userpreference = std::shared_ptr<MIXUserPreference>(new MIXUserPreference());
+    std::shared_ptr<Form> parameters(std::make_shared<Form>());
+    parameters->setType(Form::Type::ResultType);
+
+    std::shared_ptr<FormField> fieldType = std::make_shared<FormField>(FormField::HiddenType);
+    fieldType->setName("FORM_TYPE");
+    fieldType->addValue("urn:xmpp:mix:1");
+    parameters->addField(fieldType);
+
+    std::shared_ptr<FormField> fieldJIDVisibility = std::make_shared<FormField>();
+    fieldJIDVisibility->setName("JID Visibility");
+    fieldJIDVisibility->addValue("never");
+    parameters->addField(fieldJIDVisibility);
+
+    std::shared_ptr<FormField> fieldprivateMessages = std::make_shared<FormField>();
+    fieldprivateMessages->setName("Private Messages");
+    fieldprivateMessages->addValue("allow");
+    parameters->addField(fieldprivateMessages);
+
+    std::shared_ptr<FormField> vCard = std::make_shared<FormField>();
+    vCard->setName("vCard");
+    vCard->addValue("block");
+    parameters->addField(vCard);
+
+    userpreference->setData(parameters);
+
+    std::string expectedResult = "<user-preference xmlns=\"urn:xmpp:mix:1\">"
+                                    "<x type=\"result\" xmlns=\"jabber:x:data\">"
+                                        "<field type=\"hidden\" var=\"FORM_TYPE\">"
+                                             "<value>urn:xmpp:mix:1</value>"
+                                        "</field>"
+                                        "<field var=\"JID Visibility\">"
+                                            "<value>never</value>"
+                                        "</field>"
+                                        "<field var=\"Private Messages\">"
+                                            "<value>allow</value>"
+                                        "</field>"
+                                        "<field var=\"vCard\">"
+                                            "<value>block</value>"
+                                        "</field>"
+                                    "</x>"
+                                "</user-preference>";
+    ASSERT_EQ(expectedResult, testling.serialize(userpreference));
+}