diff options
author | Alex Clayton <alex.clayton@isode.com> | 2016-01-26 16:33:29 (GMT) |
---|---|---|
committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-27 12:29:01 (GMT) |
commit | 91e97e936fe671678758702bbede6a47b5487f13 (patch) | |
tree | f92b1939fb1704d602f30cbf3791bb98d1a56018 /src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java | |
parent | 97a085f7e2c9b7820000eaace97dc0ab6392cb0d (diff) | |
download | stroke-91e97e936fe671678758702bbede6a47b5487f13.zip stroke-91e97e936fe671678758702bbede6a47b5487f13.tar.bz2 |
Some fixes for File Transfer Patch
Some fixes that were required for the File Transfer Patch (see patch notes
on Gerrit).
Test-information:
By code inspection.
Ran against MLC (after modification so it works for stroke interface changes
introduces in a previous patch) it still runs correctly.
Ran unit tests they still all pass.
Change-Id: Ib49d9f9160f5e6b6b578f16695f8e8bc0f96a412
Diffstat (limited to 'src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java')
-rw-r--r-- | src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java b/src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java index f06407e..c14ee86 100644 --- a/src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java +++ b/src/com/isode/stroke/filetransfer/DefaultFileTransferTransporter.java @@ -69,13 +69,14 @@ public class DefaultFileTransferTransporter extends FileTransferTransporter { this.responder = responder; this.role = role; this.s5bRegistry = s5bRegistry; + this.s5bServerManager = s5bServerManager; this.s5bProxy = s5bProxy; this.crypto = crypto; this.router = router; localCandidateGenerator = new LocalJingleTransportCandidateGenerator( s5bServerManager, s5bProxy, - (Role.Initiator.equals(role) ? initiator : responder), + (role == Role.Initiator ? initiator : responder), idGenerator, options); localCandidateGenerator.onLocalTransportCandidatesGenerated.connect(new Slot1<Vector<JingleS5BTransportPayload.Candidate>>() { @@ -132,7 +133,7 @@ public class DefaultFileTransferTransporter extends FileTransferTransporter { logger_.fine("Start activating proxy " + proxyServiceJID.toString() + " with sid = " + s5bSessionID + ".\n"); S5BProxyRequest proxyRequest = new S5BProxyRequest(); proxyRequest.setSID(s5bSessionID); - proxyRequest.setActivate(Role.Initiator.equals(role) ? responder : initiator); + proxyRequest.setActivate(role == Role.Initiator ? responder : initiator); GenericRequest<S5BProxyRequest> request = new GenericRequest<S5BProxyRequest>(IQ.Type.Set, proxyServiceJID, proxyRequest, router); request.onResponse.connect(new Slot2<S5BProxyRequest, ErrorPayload>() { |