7 files changed, 149 insertions, 4 deletions
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 03e4208..e7e8991 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -59,6 +59,8 @@ sources = [
 		"StanzaParser.cpp",
 		"StreamErrorParser.cpp",
 		"StreamFeaturesParser.cpp",
+		"StreamManagementEnabledParser.cpp",
+		"StreamResumeParser.cpp",
 		"XMLParser.cpp",
 		"XMLParserClient.cpp",
 		"XMLParserFactory.cpp",
diff --git a/Swiften/Parser/StreamManagementEnabledParser.cpp b/Swiften/Parser/StreamManagementEnabledParser.cpp
new file mode 100644
index 0000000..906e071
--- /dev/null
+++ b/Swiften/Parser/StreamManagementEnabledParser.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/Parser/StreamManagementEnabledParser.h>
+
+using namespace Swift;
+
+StreamManagementEnabledParser::StreamManagementEnabledParser() : level(TopLevel) {
+}
+
+StreamManagementEnabledParser::~StreamManagementEnabledParser() {
+}
+
+void StreamManagementEnabledParser::handleStartElement(const std::string&, const std::string&, const AttributeMap& attributes) {
+	if (level == TopLevel) {
+		if (attributes.getBoolAttribute("resume", false)) {
+			getElementGeneric()->setResumeSupported();
+		}
+		getElementGeneric()->setResumeID(attributes.getAttribute("id"));
+	}
+	++level;
+}
+
+void StreamManagementEnabledParser::handleEndElement(const std::string&, const std::string&) {
+	--level;
+}
diff --git a/Swiften/Parser/StreamManagementEnabledParser.h b/Swiften/Parser/StreamManagementEnabledParser.h
index adc45ab..db616af 100644
--- a/Swiften/Parser/StreamManagementEnabledParser.h
+++ b/Swiften/Parser/StreamManagementEnabledParser.h
@@ -1,17 +1,27 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2011 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
-#include "Swiften/Parser/GenericElementParser.h"
-#include "Swiften/Elements/StreamManagementEnabled.h"
+#include <Swiften/Parser/GenericElementParser.h>
+#include <Swiften/Elements/StreamManagementEnabled.h>
 
 namespace Swift {
 	class StreamManagementEnabledParser : public GenericElementParser<StreamManagementEnabled> {
 		public:
-			StreamManagementEnabledParser() : GenericElementParser<StreamManagementEnabled>() {}
+			StreamManagementEnabledParser();
+			~StreamManagementEnabledParser();
+
+			virtual void handleStartElement(const std::string&, const std::string&, const AttributeMap&);
+			virtual void handleEndElement(const std::string&, const std::string&);
+
+		private:
+			enum Level { 
+				TopLevel = 0
+			};
+			int level;
 	};
 }
diff --git a/Swiften/Parser/StreamResumeParser.cpp b/Swiften/Parser/StreamResumeParser.cpp
new file mode 100644
index 0000000..f54dcf0
--- /dev/null
+++ b/Swiften/Parser/StreamResumeParser.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/Parser/StreamResumeParser.h>
+
+#include <boost/lexical_cast.hpp>
+
+using namespace Swift;
+
+StreamResumeParser::StreamResumeParser() : level(TopLevel) {
+}
+
+StreamResumeParser::~StreamResumeParser() {
+}
+
+void StreamResumeParser::handleStartElement(const std::string&, const std::string&, const AttributeMap& attributes) {
+	if (level == TopLevel) {
+		boost::optional<std::string> handledStanzasCount = attributes.getAttributeValue("h");
+		if (handledStanzasCount) {
+			try {
+				getElementGeneric()->setHandledStanzasCount(boost::lexical_cast<int>(*handledStanzasCount));
+			}
+			catch (const boost::bad_lexical_cast &) {
+			}
+		}
+		getElementGeneric()->setResumeID(attributes.getAttribute("previd"));
+	}
+	++level;
+}
+
+void StreamResumeParser::handleEndElement(const std::string&, const std::string&) {
+	--level;
+}
diff --git a/Swiften/Parser/StreamResumeParser.h b/Swiften/Parser/StreamResumeParser.h
new file mode 100644
index 0000000..0ccd24c
--- /dev/null
+++ b/Swiften/Parser/StreamResumeParser.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Parser/GenericElementParser.h>
+#include <Swiften/Elements/StreamResume.h>
+
+namespace Swift {
+	class StreamResumeParser : public GenericElementParser<StreamResume> {
+		public:
+			StreamResumeParser();
+			~StreamResumeParser();
+
+			virtual void handleStartElement(const std::string&, const std::string&, const AttributeMap&);
+			virtual void handleEndElement(const std::string&, const std::string&);
+
+		private:
+			enum Level { 
+				TopLevel = 0
+			};
+			int level;
+	};
+}
diff --git a/Swiften/Parser/UnitTest/StreamManagementEnabledParserTest.cpp b/Swiften/Parser/UnitTest/StreamManagementEnabledParserTest.cpp
new file mode 100644
index 0000000..07b7b31
--- /dev/null
+++ b/Swiften/Parser/UnitTest/StreamManagementEnabledParserTest.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <Swiften/Parser/StreamManagementEnabledParser.h>
+#include <Swiften/Parser/UnitTest/ElementParserTester.h>
+
+using namespace Swift;
+
+class StreamManagementEnabledParserTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(StreamManagementEnabledParserTest);
+		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testParse() {
+			StreamManagementEnabledParser testling;
+			ElementParserTester parser(&testling);
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<enabled xmlns=\"urn:xmpp:sm:3\" id=\"some-long-sm-id\" resume=\"true\"/>"));
+
+			boost::shared_ptr<StreamManagementEnabled> element = boost::dynamic_pointer_cast<StreamManagementEnabled>(testling.getElement());
+			CPPUNIT_ASSERT(element->getResumeSupported());
+			CPPUNIT_ASSERT_EQUAL(std::string("some-long-sm-id"), element->getResumeID());
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(StreamManagementEnabledParserTest);
diff --git a/Swiften/Parser/XMPPParser.cpp b/Swiften/Parser/XMPPParser.cpp
index 1fb7682..adcfdf5 100644
--- a/Swiften/Parser/XMPPParser.cpp
+++ b/Swiften/Parser/XMPPParser.cpp
@@ -29,6 +29,7 @@
 #include "Swiften/Parser/EnableStreamManagementParser.h"
 #include "Swiften/Parser/StreamManagementEnabledParser.h"
 #include "Swiften/Parser/StreamManagementFailedParser.h"
+#include "Swiften/Parser/StreamResumeParser.h"
 #include "Swiften/Parser/StanzaAckParser.h"
 #include "Swiften/Parser/StanzaAckRequestParser.h"
 #include "Swiften/Parser/StartTLSParser.h"
@@ -182,6 +183,12 @@ ElementParser* XMPPParser::createElementParser(const std::string& element, const
 	else if (element == "failed" && ns == "urn:xmpp:sm:2") {
 		return new StreamManagementFailedParser();
 	}
+	else if (element == "resume" && ns == "urn:xmpp:sm:2") {
+		return new StreamResumeParser();
+	}
+	else if (element == "resumed" && ns == "urn:xmpp:sm:2") {
+		return new StreamResumeParser();
+	}
 	else if (element == "a" && ns == "urn:xmpp:sm:2") {
 		return new StanzaAckParser();
 	}