1 files changed, 5 insertions, 26 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index d449179..05dd3bb 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -1,53 +1,53 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/FileTransferManagerImpl.h>
 
 #include <boost/bind.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/filesystem.hpp>
 
 #include <Swiften/Base/BoostFilesystemVersion.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/Path.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Disco/EntityCapsProvider.h>
+#include <Swiften/Disco/FeatureOracle.h>
 #include <Swiften/Elements/JingleFileTransferFileInfo.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>
 #include <Swiften/FileTransfer/IncomingFileTransferManager.h>
 #include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/ConnectionServerFactory.h>
 #include <Swiften/Network/HostAddress.h>
 #include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Presence/PresenceOracle.h>
 #include <Swiften/Queries/IQRouter.h>
 
 namespace Swift {
 
 FileTransferManagerImpl::FileTransferManagerImpl(
         const JID& ownJID,
         JingleSessionManager* jingleSessionManager,
         IQRouter* router,
         EntityCapsProvider* capsProvider,
         PresenceOracle* presOracle,
         ConnectionFactory* connectionFactory,
         ConnectionServerFactory* connectionServerFactory,
         TimerFactory* timerFactory,
         DomainNameResolver* domainNameResolver,
         NetworkEnvironment* networkEnvironment,
         NATTraverser* natTraverser,
@@ -72,115 +72,94 @@ FileTransferManagerImpl::FileTransferManagerImpl(
     outgoingFTManager = new OutgoingFileTransferManager(
             jingleSessionManager,
             iqRouter,
             transporterFactory,
             timerFactory,
             crypto);
     incomingFTManager = new IncomingFileTransferManager(
             jingleSessionManager,
             transporterFactory,
             timerFactory,
             crypto);
     incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer);
 }
 
 FileTransferManagerImpl::~FileTransferManagerImpl() {
     delete incomingFTManager;
     delete outgoingFTManager;
     delete transporterFactory;
     delete bytestreamProxy;
     delete s5bServerManager;
     delete bytestreamRegistry;
 }
 
 void FileTransferManagerImpl::start() {
 }
 
 void FileTransferManagerImpl::stop() {
     s5bServerManager->stop();
 }
 
-boost::optional<JID> FileTransferManagerImpl::highestPriorityJIDSupportingFileTransfer(const JID& bareJID) {
-    JID fullReceipientJID;
-    int priority = INT_MIN;
-
-    //getAllPresence(bareJID) gives you all presences for the bare JID (i.e. all resources) Isode Limited. @ 11:11
-    std::vector<Presence::ref> presences = presenceOracle->getAllPresence(bareJID);
-
-    //iterate over them
-    foreach(Presence::ref pres, presences) {
-        if (pres->getPriority() > priority) {
-            // look up caps from the jid
-            DiscoInfo::ref info = capsProvider->getCaps(pres->getFrom());
-            if (isSupportedBy(info)) {
-                priority = pres->getPriority();
-                fullReceipientJID = pres->getFrom();
-            }
-        }
-    }
-
-    return fullReceipientJID.isValid() ? boost::optional<JID>(fullReceipientJID) : boost::optional<JID>();
-}
-
 OutgoingFileTransfer::ref FileTransferManagerImpl::createOutgoingFileTransfer(
         const JID& to,
         const boost::filesystem::path& filepath,
         const std::string& description,
         std::shared_ptr<ReadBytestream> bytestream,
         const FileTransferOptions& config) {
 #if BOOST_FILESYSTEM_VERSION == 2 // TODO: Delete this when boost 1.44 becomes a minimum requirement, and we no longer need v2
     std::string filename = filepath.filename();
 #else
     std::string filename = pathToString(filepath.filename());
 #endif
 
     boost::uintmax_t sizeInBytes = boost::filesystem::file_size(filepath);
     boost::posix_time::ptime lastModified = boost::posix_time::from_time_t(boost::filesystem::last_write_time(filepath));
     return createOutgoingFileTransfer(to, filename, description, sizeInBytes, lastModified, bytestream, config);
 }
 
 OutgoingFileTransfer::ref FileTransferManagerImpl::createOutgoingFileTransfer(
         const JID& to,
         const std::string& filename,
         const std::string& description,
         const boost::uintmax_t sizeInBytes,
         const boost::posix_time::ptime& lastModified,
         std::shared_ptr<ReadBytestream> bytestream,
         const FileTransferOptions& config) {
     JingleFileTransferFileInfo fileInfo;
     fileInfo.setDate(lastModified);
     fileInfo.setSize(sizeInBytes);
     fileInfo.setName(filename);
     fileInfo.setDescription(description);
 
     JID receipient = to;
 
     if(receipient.isBare()) {
-        boost::optional<JID> fullJID = highestPriorityJIDSupportingFileTransfer(receipient);
-        if (fullJID.is_initialized()) {
-            receipient = fullJID.get();
+        auto featureOracle = FeatureOracle(capsProvider, presenceOracle);
+        JID fullJID = featureOracle.getMostAvailableClientForFileTrasfer(receipient);
+        if (!fullJID.toString().empty()) {
+            receipient = fullJID;
         } else {
             return OutgoingFileTransfer::ref();
         }
     }
 
     assert(!iqRouter->getJID().isBare());
 
     DiscoInfo::ref capabilities = capsProvider->getCaps(receipient);
 
     FileTransferOptions options = config;
     if (capabilities) {
         if (!capabilities->hasFeature(DiscoInfo::JingleTransportsS5BFeature)) {
             options = options.withAssistedAllowed(false).withDirectAllowed(false).withProxiedAllowed(false);
         }
         if (!capabilities->hasFeature(DiscoInfo::JingleTransportsIBBFeature)) {
             options = options.withInBandAllowed(false);
         }
     }
     else {
         SWIFT_LOG(warning) << "No entity capabilities information for " << receipient.toString() << std::endl;
     }
 
     return outgoingFTManager->createOutgoingFileTransfer(iqRouter->getJID(), receipient, bytestream, fileInfo, options);
 }
 
 }