14 files changed, 233 insertions, 0 deletions
diff --git a/Swiften/Elements/ClientState.h b/Swiften/Elements/ClientState.h
new file mode 100644
index 0000000..868d352
--- /dev/null
+++ b/Swiften/Elements/ClientState.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/Payload.h>
+
+namespace Swift {
+    class SWIFTEN_API ClientState : public Payload {
+        public:
+            typedef std::shared_ptr<ClientState> ref;
+
+        public:
+            enum class ClientStateType {Active, Inactive};
+            ClientState(ClientStateType state = ClientStateType::Active) : state_(state)  {
+
+            }
+
+            ClientStateType getClientState() const { return state_; }
+            void setClientState(ClientStateType state) {state_ = state;}
+
+        private:
+            ClientStateType state_;
+    };
+}
diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp
index 51a4450..11f0623 100644
--- a/Swiften/Elements/DiscoInfo.cpp
+++ b/Swiften/Elements/DiscoInfo.cpp
@@ -1,43 +1,44 @@
 /*
  * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/DiscoInfo.h>
 
 #include <algorithm>
 
 namespace Swift {
 
 const std::string DiscoInfo::ChatStatesFeature = std::string("http://jabber.org/protocol/chatstates");
+const std::string DiscoInfo::ClientStatesFeature = std::string("urn:xmpp:csi:0");
 const std::string DiscoInfo::SecurityLabelsFeature = std::string("urn:xmpp:sec-label:0");
 const std::string DiscoInfo::SecurityLabelsCatalogFeature = std::string("urn:xmpp:sec-label:catalog:2");
 const std::string DiscoInfo::JabberSearchFeature = std::string("jabber:iq:search");
 const std::string DiscoInfo::CommandsFeature = std::string("http://jabber.org/protocol/commands");
 const std::string DiscoInfo::MessageCorrectionFeature = std::string("urn:xmpp:message-correct:0");
 const std::string DiscoInfo::JingleFeature = std::string("urn:xmpp:jingle:1");
 const std::string DiscoInfo::JingleFTFeature = std::string("urn:xmpp:jingle:apps:file-transfer:4");
 const std::string DiscoInfo::JingleTransportsIBBFeature = std::string("urn:xmpp:jingle:transports:ibb:1");
 const std::string DiscoInfo::JingleTransportsS5BFeature = std::string("urn:xmpp:jingle:transports:s5b:1");
 const std::string DiscoInfo::Bytestream = std::string("http://jabber.org/protocol/bytestreams");
 const std::string DiscoInfo::MessageDeliveryReceiptsFeature = std::string("urn:xmpp:receipts");
 const std::string DiscoInfo::WhiteboardFeature = std::string("http://swift.im/whiteboard");
 const std::string DiscoInfo::BlockingCommandFeature = std::string("urn:xmpp:blocking");
 const std::string DiscoInfo::MessageCarbonsFeature = std::string("urn:xmpp:carbons:2");
 
 bool DiscoInfo::Identity::operator<(const Identity& other) const {
     if (category_ == other.category_) {
         if (type_ == other.type_) {
             if (lang_ == other.lang_) {
                 return name_ < other.name_;
             }
             else {
                 return lang_ < other.lang_;
             }
         }
         else {
             return type_ < other.type_;
         }
     }
     else {
diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h
index ebc598c..c8009ee 100644
--- a/Swiften/Elements/DiscoInfo.h
+++ b/Swiften/Elements/DiscoInfo.h
@@ -1,54 +1,55 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     /**
      * disco#info from XEP-0030
      */
     class SWIFTEN_API DiscoInfo : public Payload {
         public:
             typedef std::shared_ptr<DiscoInfo> ref;
 
             static const std::string ChatStatesFeature;
+            static const std::string ClientStatesFeature;
             static const std::string SecurityLabelsFeature;
             static const std::string SecurityLabelsCatalogFeature;
             static const std::string JabberSearchFeature;
             static const std::string CommandsFeature;
             static const std::string MessageCorrectionFeature;
             static const std::string JingleFeature;
             static const std::string JingleFTFeature;
             static const std::string JingleTransportsIBBFeature;
             static const std::string JingleTransportsS5BFeature;
             static const std::string Bytestream;
             static const std::string MessageDeliveryReceiptsFeature;
             static const std::string WhiteboardFeature;
             static const std::string BlockingCommandFeature;
             static const std::string MessageCarbonsFeature;
 
             class Identity {
                 public:
                     Identity(const std::string& name, const std::string& category = "client", const std::string& type = "pc", const std::string& lang = "") : name_(name), category_(category), type_(type), lang_(lang) {
                     }
 
                     const std::string& getCategory() const {
                         return category_;
                     }
 
                     const std::string& getType() const {
                         return type_;
                     }
 
                     const std::string& getLanguage() const {
                         return lang_;
diff --git a/Swiften/Parser/PayloadParsers/ClientStateParser.cpp b/Swiften/Parser/PayloadParsers/ClientStateParser.cpp
new file mode 100644
index 0000000..8a6cc9c
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/ClientStateParser.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/ClientStateParser.h>
+
+namespace Swift {
+
+ClientStateParser::ClientStateParser() {
+}
+
+void ClientStateParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap&) {
+    if (level_ == 0) {
+        auto state = ClientState::ClientStateType::Active;
+        if (element == "active") {
+            state = ClientState::ClientStateType::Active;
+        } else if (element == "inactive") {
+            state = ClientState::ClientStateType::Inactive;
+        }
+        getPayloadInternal()->setClientState(state);
+    }
+    ++level_;
+}
+
+void ClientStateParser::handleEndElement(const std::string&, const std::string&) {
+    --level_;
+}
+
+void ClientStateParser::handleCharacterData(const std::string&) {
+
+}
+
+}
diff --git a/Swiften/Parser/PayloadParsers/ClientStateParser.h b/Swiften/Parser/PayloadParsers/ClientStateParser.h
new file mode 100644
index 0000000..039ae37
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/ClientStateParser.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 <Swiften/Base/API.h>
+#include <Swiften/Elements/ClientState.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+    class SWIFTEN_API ClientStateParser : public GenericPayloadParser<ClientState> {
+        public:
+            ClientStateParser();
+
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes);
+            virtual void handleEndElement(const std::string& element, const std::string&);
+            virtual void handleCharacterData(const std::string& data);
+
+        private:
+            int level_ = 0;
+    };
+}
diff --git a/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h
new file mode 100644
index 0000000..95617a1
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/API.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/ClientStateParser.h>
+
+namespace Swift {
+    class PayloadParserFactoryCollection;
+
+    class SWIFTEN_API ClientStateParserFactory : public PayloadParserFactory {
+        public:
+            ClientStateParserFactory() {
+            }
+
+            virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const {
+                return ns == "urn:xmpp:csi:0" &&
+                    (element == "active" || element == "inactive");
+            }
+
+            virtual PayloadParser* createPayloadParser() {
+                return new ClientStateParser();
+            }
+
+    };
+}
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index b67556e..4ad943a 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -1,55 +1,56 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
 
 #include <Swiften/Elements/BlockListPayload.h>
 #include <Swiften/Elements/BlockPayload.h>
 #include <Swiften/Elements/UnblockPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/GenericPayloadParserFactory2.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/BlockParser.h>
 #include <Swiften/Parser/PayloadParsers/BodyParser.h>
 #include <Swiften/Parser/PayloadParsers/BytestreamsParser.h>
 #include <Swiften/Parser/PayloadParsers/CapsInfoParser.h>
 #include <Swiften/Parser/PayloadParsers/CarbonsDisableParser.h>
 #include <Swiften/Parser/PayloadParsers/CarbonsEnableParser.h>
 #include <Swiften/Parser/PayloadParsers/CarbonsPrivateParser.h>
 #include <Swiften/Parser/PayloadParsers/CarbonsReceivedParser.h>
 #include <Swiften/Parser/PayloadParsers/CarbonsSentParser.h>
 #include <Swiften/Parser/PayloadParsers/ChatStateParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/ClientStateParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/CommandParser.h>
 #include <Swiften/Parser/PayloadParsers/DelayParser.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/DiscoInfoParser.h>
 #include <Swiften/Parser/PayloadParsers/DiscoItemsParser.h>
 #include <Swiften/Parser/PayloadParsers/ErrorParser.h>
 #include <Swiften/Parser/PayloadParsers/ErrorParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/FormParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/ForwardedParser.h>
 #include <Swiften/Parser/PayloadParsers/IBBParser.h>
 #include <Swiften/Parser/PayloadParsers/IdleParser.h>
 #include <Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h>
 #include <Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleContentPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleReasonParser.h>
 #include <Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h>
 #include <Swiften/Parser/PayloadParsers/LastParser.h>
 #include <Swiften/Parser/PayloadParsers/MAMFinParser.h>
 #include <Swiften/Parser/PayloadParsers/MAMQueryParser.h>
 #include <Swiften/Parser/PayloadParsers/MAMResultParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCAdminPayloadParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCDestroyPayloadParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.h>
@@ -100,60 +101,61 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<BodyParser> >("body"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<SubjectParser> >("subject"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<ThreadParser> >("thread"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<PriorityParser> >("priority"));
     factories_.push_back(std::make_shared<ErrorParserFactory>(this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<DelayParser> >("delay", "urn:xmpp:delay"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<SoftwareVersionParser> >("query", "jabber:iq:version"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<StorageParser> >("storage", "storage:bookmarks"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<RosterItemExchangeParser> >("x", "http://jabber.org/protocol/rosterx"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<RosterParser> >("query", "jabber:iq:roster"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<DiscoInfoParser> >("query", "http://jabber.org/protocol/disco#info"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<DiscoItemsParser> >("query", "http://jabber.org/protocol/disco#items"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<CapsInfoParser> >("c", "http://jabber.org/protocol/caps"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<ResourceBindParser> >("bind", "urn:ietf:params:xml:ns:xmpp-bind"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<StartSessionParser> >("session", "urn:ietf:params:xml:ns:xmpp-session"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<BlockParser<BlockPayload> > >("block", "urn:xmpp:blocking"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<BlockParser<BlockListPayload> > >("blocklist", "urn:xmpp:blocking"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<BlockParser<UnblockPayload> > >("unblock", "urn:xmpp:blocking"));
     factories_.push_back(std::make_shared<SecurityLabelParserFactory>());
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<SecurityLabelsCatalogParser> >("catalog", "urn:xmpp:sec-label:catalog:2"));
     factories_.push_back(std::make_shared<FormParserFactory>());
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<CommandParser> >("command", "http://jabber.org/protocol/commands"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<InBandRegistrationPayloadParser> >("query", "jabber:iq:register"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<SearchPayloadParser> >("query", "jabber:iq:search"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<StreamInitiationParser> >("si", "http://jabber.org/protocol/si"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<BytestreamsParser> >("query", "http://jabber.org/protocol/bytestreams"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<VCardUpdateParser> >("x", "vcard-temp:x:update"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<VCardParser> >("vCard", "vcard-temp"));
     factories_.push_back(std::make_shared<PrivateStorageParserFactory>(this));
     factories_.push_back(std::make_shared<ChatStateParserFactory>());
+    factories_.push_back(std::make_shared<ClientStateParserFactory>());
     factories_.push_back(std::make_shared<MUCUserPayloadParserFactory>(this));
     factories_.push_back(std::make_shared<MUCOwnerPayloadParserFactory>(this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<MUCInvitationPayloadParser> >("x", "jabber:x:conference"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<MUCAdminPayloadParser> >("query", "http://jabber.org/protocol/muc#admin"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<MUCDestroyPayloadParser> >("destroy", "http://jabber.org/protocol/muc#user"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<MUCDestroyPayloadParser> >("destroy", "http://jabber.org/protocol/muc#owner"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<NicknameParser> >("nick", "http://jabber.org/protocol/nick"));
     factories_.push_back(std::make_shared<JingleParserFactory>(this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<JingleReasonParser> >("reason", "urn:xmpp:jingle:1"));
     factories_.push_back(std::make_shared<JingleContentPayloadParserFactory>(this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<JingleIBBTransportMethodPayloadParser> >("transport", "urn:xmpp:jingle:transports:ibb:1"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<JingleS5BTransportMethodPayloadParser> >("transport", "urn:xmpp:jingle:transports:s5b:1"));
     factories_.push_back(std::make_shared<JingleFileTransferDescriptionParserFactory>(this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<StreamInitiationFileInfoParser> >("file", "http://jabber.org/protocol/si/profile/file-transfer"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<JingleFileTransferFileInfoParser> >("file", "urn:xmpp:jingle:apps:file-transfer:4"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<JingleFileTransferHashParser> >("checksum"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<S5BProxyRequestParser> >("query", "http://jabber.org/protocol/bytestreams"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<WhiteboardParser> >("wb", "http://swift.im/whiteboard"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<UserLocationParser> >("geoloc", "http://jabber.org/protocol/geoloc"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<UserTuneParser> >("tune", "http://jabber.org/protocol/tune"));
     factories_.push_back(std::make_shared<DeliveryReceiptParserFactory>());
     factories_.push_back(std::make_shared<DeliveryReceiptRequestParserFactory>());
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<IdleParser> >("idle", "urn:xmpp:idle:1"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory2<PubSubParser> >("pubsub", "http://jabber.org/protocol/pubsub", this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory2<PubSubOwnerPubSubParser> >("pubsub", "http://jabber.org/protocol/pubsub#owner", this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory2<PubSubEventParser> >("event", "http://jabber.org/protocol/pubsub#event", this));
     factories_.push_back(std::make_shared<PubSubErrorParserFactory>());
     factories_.push_back(std::make_shared<GenericPayloadParserFactory<ResultSetParser> >("set", "http://jabber.org/protocol/rsm"));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory2<ForwardedParser> >("forwarded", "urn:xmpp:forward:0", this));
     factories_.push_back(std::make_shared<GenericPayloadParserFactory2<MAMResultParser> >("result", "urn:xmpp:mam:0", this));
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ClientStateParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ClientStateParserTest.cpp
new file mode 100644
index 0000000..ca89040
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UnitTest/ClientStateParserTest.cpp
@@ -0,0 +1,32 @@
+/*
+ * 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/Elements/ClientState.h>
+#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
+
+using namespace Swift;
+
+TEST(ClientStateParserTest, testParse_Active) {
+    PayloadsParserTester parser;
+    ASSERT_TRUE(parser.parse(
+                "<active xmlns='urn:xmpp:csi:0'/>"
+                ));
+
+    ClientState::ref payload = parser.getPayload<ClientState>();
+    ASSERT_EQ(ClientState::ClientStateType::Active, payload->getClientState());
+}
+
+TEST(ClientStateParserTest, testParse_Inactive) {
+    PayloadsParserTester parser;
+    ASSERT_TRUE(parser.parse(
+                "<inactive xmlns='urn:xmpp:csi:0'/>"
+                ));
+
+    ClientState::ref payload = parser.getPayload<ClientState>();
+    ASSERT_EQ(ClientState::ClientStateType::Inactive, payload->getClientState());
+}
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 840cbda..1797de1 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -3,60 +3,61 @@ Import("swiften_env")
 myenv = swiften_env.Clone()
 myenv.MergeFlags(swiften_env["BOOST_FLAGS"])
 myenv.MergeFlags(swiften_env.get("LIBXML_FLAGS", ""))
 myenv.MergeFlags(swiften_env.get("EXPAT_FLAGS", ""))
 
 sources = [
         "AttributeMap.cpp",
         "AuthRequestParser.cpp",
         "AuthChallengeParser.cpp",
         "AuthSuccessParser.cpp",
         "AuthResponseParser.cpp",
         "CompressParser.cpp",
         "ElementParser.cpp",
         "IQParser.cpp",
         "MessageParser.cpp",
         "PayloadParser.cpp",
         "StanzaAckParser.cpp",
         "BOSHBodyExtractor.cpp",
         "ComponentHandshakeParser.cpp",
         "PayloadParserFactory.cpp",
         "PayloadParserFactoryCollection.cpp",
         "PayloadParsers/BodyParser.cpp",
         "PayloadParsers/SubjectParser.cpp",
         "PayloadParsers/ThreadParser.cpp",
         "PayloadParsers/CarbonsEnableParser.cpp",
         "PayloadParsers/CarbonsDisableParser.cpp",
         "PayloadParsers/CarbonsPrivateParser.cpp",
         "PayloadParsers/CarbonsReceivedParser.cpp",
         "PayloadParsers/CarbonsSentParser.cpp",
         "PayloadParsers/ChatStateParser.cpp",
+        "PayloadParsers/ClientStateParser.cpp",
         "PayloadParsers/CapsInfoParser.cpp",
         "PayloadParsers/DiscoInfoParser.cpp",
         "PayloadParsers/DiscoItemsParser.cpp",
         "PayloadParsers/ErrorParser.cpp",
         "PayloadParsers/FormParser.cpp",
         "PayloadParsers/IBBParser.cpp",
         "PayloadParsers/JingleParser.cpp",
         "PayloadParsers/JingleReasonParser.cpp",
         "PayloadParsers/JingleContentPayloadParser.cpp",
         "PayloadParsers/JingleIBBTransportMethodPayloadParser.cpp",
         "PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp",
         "PayloadParsers/JingleFileTransferDescriptionParser.cpp",
         "PayloadParsers/JingleFileTransferHashParser.cpp",
         "PayloadParsers/JingleFileTransferFileInfoParser.cpp",
         "PayloadParsers/StreamInitiationFileInfoParser.cpp",
         "PayloadParsers/CommandParser.cpp",
         "PayloadParsers/InBandRegistrationPayloadParser.cpp",
         "PayloadParsers/SearchPayloadParser.cpp",
         "PayloadParsers/FullPayloadParserFactoryCollection.cpp",
         "PayloadParsers/PriorityParser.cpp",
         "PayloadParsers/PrivateStorageParser.cpp",
         "PayloadParsers/RawXMLPayloadParser.cpp",
         "PayloadParsers/ResourceBindParser.cpp",
         "PayloadParsers/RosterItemExchangeParser.cpp",
         "PayloadParsers/RosterParser.cpp",
         "PayloadParsers/SecurityLabelParser.cpp",
         "PayloadParsers/SecurityLabelsCatalogParser.cpp",
         "PayloadParsers/SoftwareVersionParser.cpp",
         "PayloadParsers/StorageParser.cpp",
         "PayloadParsers/StatusParser.cpp",
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 1103362..2182132 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -175,60 +175,61 @@ if env["SCONS_STAGE"] == "build" :
             "Queries/IQHandler.cpp",
             "Queries/IQRouter.cpp",
             "Queries/Request.cpp",
             "Queries/Responders/SoftwareVersionResponder.cpp",
             "Roster/RosterStorage.cpp",
             "Roster/RosterMemoryStorage.cpp",
             "Roster/XMPPRoster.cpp",
             "Roster/XMPPRosterImpl.cpp",
             "Roster/XMPPRosterController.cpp",
             "Serializer/AuthRequestSerializer.cpp",
             "Serializer/AuthSuccessSerializer.cpp",
             "Serializer/AuthChallengeSerializer.cpp",
             "Serializer/AuthResponseSerializer.cpp",
             "Serializer/CompressRequestSerializer.cpp",
             "Serializer/ElementSerializer.cpp",
             "Serializer/MessageSerializer.cpp",
             "Serializer/StreamManagementEnabledSerializer.cpp",
             "Serializer/StreamResumeSerializer.cpp",
             "Serializer/StreamResumedSerializer.cpp",
             "Serializer/ComponentHandshakeSerializer.cpp",
             "Serializer/PayloadSerializer.cpp",
             "Serializer/PayloadSerializerCollection.cpp",
             "Serializer/PayloadSerializers/IBBSerializer.cpp",
             "Serializer/PayloadSerializers/CapsInfoSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsDisableSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsEnableSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsPrivateSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsSentSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsReceivedSerializer.cpp",
             "Serializer/PayloadSerializers/ChatStateSerializer.cpp",
+            "Serializer/PayloadSerializers/ClientStateSerializer.cpp",
             "Serializer/PayloadSerializers/DiscoInfoSerializer.cpp",
             "Serializer/PayloadSerializers/DiscoItemsSerializer.cpp",
             "Serializer/PayloadSerializers/ErrorSerializer.cpp",
             "Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp",
             "Serializer/PayloadSerializers/MUCPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MUCAdminPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/ResourceBindSerializer.cpp",
             "Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp",
             "Serializer/PayloadSerializers/RosterSerializer.cpp",
             "Serializer/PayloadSerializers/SecurityLabelSerializer.cpp",
             "Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp",
             "Serializer/PayloadSerializers/SoftwareVersionSerializer.cpp",
             "Serializer/PayloadSerializers/StreamInitiationSerializer.cpp",
             "Serializer/PayloadSerializers/BytestreamsSerializer.cpp",
             "Serializer/PayloadSerializers/VCardSerializer.cpp",
             "Serializer/PayloadSerializers/VCardUpdateSerializer.cpp",
             "Serializer/PayloadSerializers/StorageSerializer.cpp",
             "Serializer/PayloadSerializers/PrivateStorageSerializer.cpp",
             "Serializer/PayloadSerializers/DelaySerializer.cpp",
             "Serializer/PayloadSerializers/CommandSerializer.cpp",
             "Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/SearchPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/FormSerializer.cpp",
             "Serializer/PayloadSerializers/NicknameSerializer.cpp",
             "Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.cpp",
             "Serializer/PayloadSerializers/JinglePayloadSerializer.cpp",
@@ -387,60 +388,61 @@ if env["SCONS_STAGE"] == "build" :
             File("Component/UnitTest/ComponentConnectorTest.cpp"),
             File("Component/UnitTest/ComponentSessionTest.cpp"),
             File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),
             File("Disco/UnitTest/CapsManagerTest.cpp"),
             File("Disco/UnitTest/DiscoInfoResponderTest.cpp"),
             File("Disco/UnitTest/EntityCapsManagerTest.cpp"),
             File("Disco/UnitTest/FeatureOracleTest.cpp"),
             File("Disco/UnitTest/JIDDiscoInfoResponderTest.cpp"),
             File("Elements/UnitTest/IQTest.cpp"),
             File("Elements/UnitTest/StanzaTest.cpp"),
             File("Elements/UnitTest/FormTest.cpp"),
             File("EventLoop/UnitTest/EventLoopTest.cpp"),
             File("EventLoop/UnitTest/SimpleEventLoopTest.cpp"),
 #           File("History/UnitTest/SQLiteHistoryManagerTest.cpp"),
             File("JID/UnitTest/JIDTest.cpp"),
             File("LinkLocal/UnitTest/LinkLocalConnectorTest.cpp"),
             File("LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp"),
             File("LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp"),
             File("LinkLocal/UnitTest/LinkLocalServiceTest.cpp"),
             File("MUC/UnitTest/MUCTest.cpp"),
             File("MUC/UnitTest/MockMUC.cpp"),
             File("Network/UnitTest/HostAddressTest.cpp"),
             File("Network/UnitTest/ConnectorTest.cpp"),
             File("Network/UnitTest/ChainedConnectorTest.cpp"),
             File("Network/UnitTest/DomainNameServiceQueryTest.cpp"),
             File("Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp"),
             File("Network/UnitTest/BOSHConnectionTest.cpp"),
             File("Network/UnitTest/BOSHConnectionPoolTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/BlockParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/ClientStateParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/DiscoItemsParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/FormParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/CommandParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/PriorityParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/ResourceBindParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/RosterParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/IBBParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/InBandRegistrationPayloadParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/JingleParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/SecurityLabelParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/SoftwareVersionParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/StatusParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/StatusShowParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/StreamInitiationParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/VCardParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/StorageParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/ReplaceTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/MUCAdminPayloadParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/DeliveryReceiptParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/IdleParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp"),
@@ -455,60 +457,61 @@ if env["SCONS_STAGE"] == "build" :
             File("Parser/UnitTest/BOSHBodyExtractorTest.cpp"),
             File("Parser/UnitTest/AttributeMapTest.cpp"),
             File("Parser/UnitTest/EnumParserTest.cpp"),
             File("Parser/UnitTest/IQParserTest.cpp"),
             File("Parser/UnitTest/GenericPayloadTreeParserTest.cpp"),
             File("Parser/UnitTest/MessageParserTest.cpp"),
             File("Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp"),
             File("Parser/UnitTest/PresenceParserTest.cpp"),
             File("Parser/UnitTest/StanzaAckParserTest.cpp"),
             File("Parser/UnitTest/SerializingParserTest.cpp"),
             File("Parser/UnitTest/StanzaParserTest.cpp"),
             File("Parser/UnitTest/StreamFeaturesParserTest.cpp"),
             File("Parser/UnitTest/StreamManagementEnabledParserTest.cpp"),
             File("Parser/UnitTest/XMLParserTest.cpp"),
             File("Parser/UnitTest/XMPPParserTest.cpp"),
             File("Presence/UnitTest/PresenceOracleTest.cpp"),
             File("Presence/UnitTest/DirectedPresenceSenderTest.cpp"),
             File("Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp"),
             File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),
             File("Queries/UnitTest/IQRouterTest.cpp"),
             File("Queries/UnitTest/RequestTest.cpp"),
             File("Queries/UnitTest/ResponderTest.cpp"),
             File("Roster/UnitTest/XMPPRosterImplTest.cpp"),
             File("Roster/UnitTest/XMPPRosterControllerTest.cpp"),
             File("Roster/UnitTest/XMPPRosterSignalHandler.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/BlockSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/CarbonsSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ChatStateSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/ClientStateSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/IBBSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/PrioritySerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ResourceBindSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/SoftwareVersionSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/StatusSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/StatusShowSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/InBandRegistrationPayloadSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/IsodeIQDelegationSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/VCardUpdateSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/VCardSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MUCAdminPayloadSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/DeliveryReceiptSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/IdleSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ForwardedSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp"),
diff --git a/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.cpp
new file mode 100644
index 0000000..1485dcb
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h>
+
+namespace Swift {
+
+ClientStateSerializer::ClientStateSerializer() : GenericPayloadSerializer<ClientState>() {
+}
+
+std::string ClientStateSerializer::serializePayload(std::shared_ptr<ClientState> clientState)  const {
+    std::string result("<");
+    switch (clientState->getClientState()) {
+        case ClientState::ClientStateType::Active: result += "active"; break;
+        case ClientState::ClientStateType::Inactive: result += "inactive"; break;
+    }
+    result += " xmlns=\"urn:xmpp:csi:0\"/>";
+    return result;
+}
+
+}
diff --git a/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h b/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h
new file mode 100644
index 0000000..1c4f977
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/ClientStateSerializer.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2017 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/ClientState.h>
+#include <Swiften/Serializer/GenericPayloadSerializer.h>
+
+namespace Swift {
+    class SWIFTEN_API ClientStateSerializer : public GenericPayloadSerializer<ClientState> {
+        public:
+            ClientStateSerializer();
+
+            virtual std::string serializePayload(std::shared_ptr<ClientState> error)  const;
+    };
+}
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index cf0b54c..bb3632b 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -1,52 +1,53 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
 #include <Swiften/Elements/BlockListPayload.h>
 #include <Swiften/Elements/BlockPayload.h>
 #include <Swiften/Elements/UnblockPayload.h>
 #include <Swiften/Serializer/PayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/BlockSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/BodySerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CapsInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsDisableSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsEnableSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsPrivateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsReceivedSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/CarbonsSentSerializer.h>
 #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/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>
@@ -63,60 +64,61 @@
 #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>
 #include <Swiften/Serializer/PayloadSerializers/SubjectSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ThreadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/VCardSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/VCardUpdateSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h>
 
 namespace Swift {
 
 FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
     serializers_.push_back(new IBBSerializer());
     serializers_.push_back(new BodySerializer());
     serializers_.push_back(new SubjectSerializer());
     serializers_.push_back(new ThreadSerializer());
     serializers_.push_back(new ChatStateSerializer());
+    serializers_.push_back(new ClientStateSerializer());
     serializers_.push_back(new PrioritySerializer());
     serializers_.push_back(new ErrorSerializer(this));
     serializers_.push_back(new RosterSerializer());
     serializers_.push_back(new RosterItemExchangeSerializer());
     serializers_.push_back(new MUCPayloadSerializer());
     serializers_.push_back(new MUCDestroyPayloadSerializer());
     serializers_.push_back(new MUCAdminPayloadSerializer());
     serializers_.push_back(new MUCInvitationPayloadSerializer());
     serializers_.push_back(new MUCOwnerPayloadSerializer(this));
     serializers_.push_back(new MUCUserPayloadSerializer(this));
     serializers_.push_back(new SoftwareVersionSerializer());
     serializers_.push_back(new StatusSerializer());
     serializers_.push_back(new StatusShowSerializer());
     serializers_.push_back(new DiscoInfoSerializer());
     serializers_.push_back(new DiscoItemsSerializer());
     serializers_.push_back(new CapsInfoSerializer());
     serializers_.push_back(new BlockSerializer<BlockPayload>("block"));
     serializers_.push_back(new BlockSerializer<UnblockPayload>("unblock"));
     serializers_.push_back(new BlockSerializer<BlockListPayload>("blocklist"));
     serializers_.push_back(new ResourceBindSerializer());
     serializers_.push_back(new StartSessionSerializer());
     serializers_.push_back(new SecurityLabelSerializer());
     serializers_.push_back(new SecurityLabelsCatalogSerializer());
     serializers_.push_back(new StreamInitiationSerializer());
     serializers_.push_back(new BytestreamsSerializer());
     serializers_.push_back(new VCardSerializer());
     serializers_.push_back(new VCardUpdateSerializer());
     serializers_.push_back(new RawXMLPayloadSerializer());
     serializers_.push_back(new StorageSerializer());
     serializers_.push_back(new DelaySerializer());
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/ClientStateSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/ClientStateSerializerTest.cpp
new file mode 100644
index 0000000..1622354
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/ClientStateSerializerTest.cpp
@@ -0,0 +1,25 @@
+/*
+ * 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/ClientStateSerializer.h>
+
+using namespace Swift;
+
+TEST(ClientStateSerializerTest, testSerialize_ActiveState) {
+    ClientStateSerializer testling;
+    std::shared_ptr<ClientState> priority(new ClientState(ClientState::ClientStateType::Active));
+
+    ASSERT_EQ(std::string("<active xmlns=\"urn:xmpp:csi:0\"/>"), testling.serialize(priority));
+}
+
+TEST(ClientStateSerializerTest, testSerialize_InacativeState) {
+    ClientStateSerializer testling;
+    std::shared_ptr<ClientState> priority(new ClientState(ClientState::ClientStateType::Inactive));
+
+    ASSERT_EQ(std::string("<inactive xmlns=\"urn:xmpp:csi:0\"/>"), testling.serialize(priority));
+}