Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-11 15:40:09 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-11 09:36:03 (GMT) |
| commit | f176050a50fb846bbad3fb49d6b2f7a2c81e3589 (patch) | |
| tree | bd93b8b540cb3818cc0d47d44b9dd8751dd17dd5 /Swiften/FileTransfer/OutgoingFileTransferManager.cpp | |
| parent | 71e34ffa7144441bc5a7fce15728f506daffc756 (diff) | |
| download | swift-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.cpp | 7 |
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 @@ -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-2014 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/FileTransfer/OutgoingFileTransferManager.h> @@ -22,18 +22,20 @@ #include <Swiften/Base/IDGenerator.h> 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(); } OutgoingFileTransferManager::~OutgoingFileTransferManager() { delete idGenerator; @@ -50,12 +52,13 @@ boost::shared_ptr<OutgoingFileTransfer> OutgoingFileTransferManager::createOutgo jingleSessionManager->registerOutgoingSession(from, jingleSession); return boost::shared_ptr<OutgoingJingleFileTransfer>(new OutgoingJingleFileTransfer( recipient, jingleSession, readBytestream, transporterFactory, + timerFactory, idGenerator, fileInfo, config, crypto)); } |