Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-01-27 16:36:15 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-28 12:25:43 (GMT) |
| commit | ceb4798aa0739ebd7177632c3f508babacb2f8d7 (patch) | |
| tree | 7e5a2c1852261c8f0e4d8ed3262a32cced037378 /src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java | |
| parent | 93eb4ab62a08da883cab4a3743a3a86c198eb0b4 (diff) | |
| download | stroke-ceb4798aa0739ebd7177632c3f508babacb2f8d7.zip stroke-ceb4798aa0739ebd7177632c3f508babacb2f8d7.tar.bz2 | |
Changes to FileTransfer to be inline with current Swiften code
There has been some changes to the file transfer clases in Swiften since Tarun's
patch was written. This patch updates the java classes to bring them in line
with the swiften one.
In details
IBBSendSession - added code to clean up onResponse connection when not needed.
In Swiften this was done by keeping reference to current session using boost
bindings to remove binding. In java we have to keep a reference to the current
onResponse connection and disconnect it when not neeeded.
IncomingFileTransferManager - Remove redundant IQRouter field.
LocalJingeTransportCandidateGenerator - Do not advertise link-local IPv6
addresses in FT candidates
OutgoingSIFileTransfer - File deleted
SOCKS5BytestreamProxiesManager and SOCKS5BytestreamProxyFinder - Search for all
proxies instead of just one.
Test-information:
Ran make and make test to check everything built ok and that the unit tests
still passed.
Change-Id: I696444e5074fe20625243693a44c836306b3a41e
Diffstat (limited to 'src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java')
| -rw-r--r-- | src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java b/src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java index 58ea74e..da5e120 100644 --- a/src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java +++ b/src/com/isode/stroke/filetransfer/FileTransferManagerImpl.java @@ -88,8 +88,7 @@ public class FileTransferManagerImpl extends FileTransferManager { timerFactory, crypto); incomingFTManager = new IncomingFileTransferManager( - jingleSessionManager, - iqRouter, + jingleSessionManager, transporterFactory, timerFactory, crypto); |