Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-08-03 12:08:37 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-21 10:47:51 (GMT) |
| commit | 97a085f7e2c9b7820000eaace97dc0ab6392cb0d (patch) | |
| tree | d3df191a053a69bc52238b76b8e9e42af043302c /src/com/isode/stroke/disco/FeatureOracle.java | |
| parent | fa1633e3b4d75a8217459cdc5fe64e9ee5ace65a (diff) | |
| download | stroke-97a085f7e2c9b7820000eaace97dc0ab6392cb0d.zip stroke-97a085f7e2c9b7820000eaace97dc0ab6392cb0d.tar.bz2 | |
Completes FileTransfer according to Swiften.
S5BTransport Session still needs generic T.
FileTransfer, OutgoingFileTransfer and IncomingFileTransfer are made an interface due to the need of multiple inheritance in
IncomingJingleFileTransfer and OutgoingJingleFileTransfer. Corresponding documentation has been updated.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
None.
Change-Id: If44cf387767865c37492d871c12d623f94ebaa3a
Diffstat (limited to 'src/com/isode/stroke/disco/FeatureOracle.java')
| -rw-r--r-- | src/com/isode/stroke/disco/FeatureOracle.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/isode/stroke/disco/FeatureOracle.java b/src/com/isode/stroke/disco/FeatureOracle.java index e01b2ab..12a45b4 100644 --- a/src/com/isode/stroke/disco/FeatureOracle.java +++ b/src/com/isode/stroke/disco/FeatureOracle.java @@ -17,7 +17,7 @@ import com.isode.stroke.elements.Presence; import com.isode.stroke.jid.JID; import com.isode.stroke.disco.EntityCapsProvider; import com.isode.stroke.presence.PresenceOracle; -//import com.isode.stroke.filetransfer.FileTransferManager; +import com.isode.stroke.filetransfer.FileTransferManager; import java.util.List; import java.util.ArrayList; import java.util.Collection; @@ -32,10 +32,7 @@ public class FeatureOracle { this.presenceOracle_ = presenceOracle; } - /** - * To PORT : FileTransfer. - */ - /*public Tristate isFileTransferSupported(JID jid) { + public Tristate isFileTransferSupported(JID jid) { DiscoInfo discoInfo = getDiscoResultForJID(jid); if (discoInfo != null) { return FileTransferManager.isSupportedBy(discoInfo) ? Tristate.Yes : Tristate.No; @@ -43,7 +40,7 @@ public class FeatureOracle { else { return Tristate.Maybe; } - }*/ + } public Tristate isMessageReceiptsSupported(JID jid) { return isFeatureSupported(jid, DiscoInfo.MessageDeliveryReceiptsFeature); |