1 files changed, 36 insertions, 20 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.cpp b/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.cpp
index 87f8317..4adf3bd 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.cpp
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.cpp
@@ -4,40 +4,56 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#include "JingleFileTransferHashParser.h"
+/*
+ * Copyright (c) 2014-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h>
+
+#include <memory>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/algorithm/string.hpp>
 
-#include <Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h>
 
 namespace Swift {
 
-JingleFileTransferHashParser::JingleFileTransferHashParser() {
+JingleFileTransferHashParser::JingleFileTransferHashParser() : level(0) {
 }
-	
-void JingleFileTransferHashParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) {
-	if (element == "hash") {
-		algo = attributes.getAttribute("algo");
-	}
+
+void JingleFileTransferHashParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+    if (level == 1 && element == "file") {
+        currentPayloadParser = std::make_shared<JingleFileTransferFileInfoParser>();
+    }
+
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleStartElement(element, ns, attributes);
+    }
+    ++level;
 }
 
-void JingleFileTransferHashParser::handleEndElement(const std::string& element, const std::string& ) {
-	if (element == "hash" && !algo.empty() && !hash.empty()) {
-		getPayloadInternal()->setHash(algo, hash);
-		algo.clear();
-		hash.clear();
-	}
+void JingleFileTransferHashParser::handleEndElement(const std::string& element, const std::string& ns) {
+    --level;
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleEndElement(element, ns);
+    }
+
+    if (level == 1) {
+        std::shared_ptr<JingleFileTransferFileInfo> info = std::dynamic_pointer_cast<JingleFileTransferFileInfo>(currentPayloadParser->getPayload());
+        if (info) {
+            getPayloadInternal()->setFileInfo(*info);
+        }
+    }
 }
 
 void JingleFileTransferHashParser::handleCharacterData(const std::string& data) {
-	if (!algo.empty()) {
-		std::string new_data(data);
-		boost::trim(new_data);
-		hash += new_data;
-	}
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleCharacterData(data);
+    }
 }
 
 }