From 4fe69e092027fd1dd2089cd5ece1e50feb3248b2 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 9 Mar 2012 10:16:46 +0000 Subject: [PATCH] Removes advertising bytestream used for jabber file transfers, leaving ibb. --- .../protocol/jabber/OperationSetFileTransferJabberImpl.java | 3 +++ .../protocol/jabber/ProtocolProviderServiceJabberImpl.java | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java index 1056824bc..4db7dd2f8 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java @@ -94,6 +94,9 @@ public OperationSetFileTransferJabberImpl( provider.addRegistrationStateChangeListener( new RegistrationStateListener()); + + // use only ibb for file transfers + FileTransferNegotiator.IBB_ONLY = true; } /** diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java index 78d0883cb..7273fc007 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -1276,10 +1276,7 @@ private void registerServiceDiscoveryManager() discoveryManager = new ScServiceDiscoveryManager( this, - // Remove features supported by smack, but not supported in - // Jitsi. bytestream don't work correctly. - new String[] { "http://jabber.org/protocol/commands", - Socks5BytestreamManager.NAMESPACE}, + new String[] { "http://jabber.org/protocol/commands"}, // Add features Jitsi supports in addition to smack. supportedFeatures.toArray( new String[supportedFeatures.size()]));