summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-01-11 15:40:09 (GMT)
committerSwift Review <review@swift.im>2015-02-11 09:36:03 (GMT)
commitf176050a50fb846bbad3fb49d6b2f7a2c81e3589 (patch)
treebd93b8b540cb3818cc0d47d44b9dd8751dd17dd5 /Swiften/FileTransfer/OutgoingFileTransferManager.cpp
parent71e34ffa7144441bc5a7fce15728f506daffc756 (diff)
downloadswift-f176050a50fb846bbad3fb49d6b2f7a2c81e3589.zip
swift-f176050a50fb846bbad3fb49d6b2f7a2c81e3589.tar.bz2
Wait for responder to terminate the the file transfer session after data
verification. Test-Information: Tested with FileTransferTest (coming with future commit) and inspected the logs. Change-Id: Idd2739e15ab944e8486065cb2a3bc559ce9053d1
Diffstat (limited to 'Swiften/FileTransfer/OutgoingFileTransferManager.cpp')
-rw-r--r--Swiften/FileTransfer/OutgoingFileTransferManager.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/OutgoingFileTransferManager.cpp b/Swiften/FileTransfer/OutgoingFileTransferManager.cpp
index 5d0555f..0ed2395 100644
--- a/Swiften/FileTransfer/OutgoingFileTransferManager.cpp
+++ b/Swiften/FileTransfer/OutgoingFileTransferManager.cpp
@@ -5,7 +5,7 @@
*/
/*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -25,12 +25,14 @@ namespace Swift {
OutgoingFileTransferManager::OutgoingFileTransferManager(
JingleSessionManager* jingleSessionManager,
- IQRouter* router,
+ IQRouter* router,
FileTransferTransporterFactory* transporterFactory,
+ TimerFactory* timerFactory,
CryptoProvider* crypto) :
jingleSessionManager(jingleSessionManager),
iqRouter(router),
transporterFactory(transporterFactory),
+ timerFactory(timerFactory),
crypto(crypto) {
idGenerator = new IDGenerator();
}
@@ -53,6 +55,7 @@ boost::shared_ptr<OutgoingFileTransfer> OutgoingFileTransferManager::createOutgo
jingleSession,
readBytestream,
transporterFactory,
+ timerFactory,
idGenerator,
fileInfo,
config,