1 files changed, 7 insertions, 5 deletions
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
index 93214eb..369af8f 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (C) 2013 Isode Limited.
+ * Copyright (C) 2013-2014 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 // TODO: 
 // - We should handle incoming terminates after we have terminated, so the other
@@ -46,13 +46,13 @@ static const int DEFAULT_BLOCK_SIZE = 4096;
 OutgoingJingleFileTransfer::OutgoingJingleFileTransfer(
 		const JID& toJID,
 		JingleSession::ref session,
 		boost::shared_ptr<ReadBytestream> stream,
 		FileTransferTransporterFactory* transporterFactory,
 		IDGenerator* idGenerator,
-		const StreamInitiationFileInfo& fileInfo,
+		const JingleFileTransferFileInfo& fileInfo,
 		const FileTransferOptions& options,
 		CryptoProvider* crypto) :
 			JingleFileTransfer(session, toJID, transporterFactory),
 			idGenerator(idGenerator),
 			stream(stream),
 			fileInfo(fileInfo),
@@ -146,26 +146,28 @@ void OutgoingJingleFileTransfer::handleTransportAcceptReceived(const JingleConte
 }
 
 void OutgoingJingleFileTransfer::sendSessionInfoHash() {
 	SWIFT_LOG(debug) << std::endl;
 
 	JingleFileTransferHash::ref hashElement = boost::make_shared<JingleFileTransferHash>();
-	hashElement->setHash("sha-1", hashCalculator->getSHA1String());
-	hashElement->setHash("md5", hashCalculator->getMD5String());
+	hashElement->getFileInfo().addHash(HashElement("sha-1", hashCalculator->getSHA1Hash()));
+	hashElement->getFileInfo().addHash(HashElement("md5", hashCalculator->getMD5Hash()));
 	session->sendInfo(hashElement);
 }
 
 void OutgoingJingleFileTransfer::handleLocalTransportCandidatesGenerated(
 		const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
 	SWIFT_LOG(debug) << std::endl;
 	if (state != GeneratingInitialLocalCandidates) { SWIFT_LOG(warning) << "Incorrect state" << std::endl; return; }
 
 	fillCandidateMap(localCandidates, candidates);
 
 	JingleFileTransferDescription::ref description = boost::make_shared<JingleFileTransferDescription>();
-	description->addOffer(fileInfo);
+	fileInfo.addHash(HashElement("sha-1", ByteArray()));
+	fileInfo.addHash(HashElement("md5", ByteArray()));
+	description->setFileInfo(fileInfo);
 
 	JingleS5BTransportPayload::ref transport = boost::make_shared<JingleS5BTransportPayload>();
 	transport->setSessionID(s5bSessionID);
 	transport->setMode(JingleS5BTransportPayload::TCPMode);
 	foreach(JingleS5BTransportPayload::Candidate candidate, candidates) {
 		transport->addCandidate(candidate);