1 files changed, 3 insertions, 16 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
index c2e92a9e..28bb3a1c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
@@ -15,10 +15,7 @@ import de.thedevstack.conversationsplus.services.filetransfer.AbstractFileTransf
 import de.thedevstack.conversationsplus.utils.AccountUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
-import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
-import de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload.HttpUpload;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload.HttpUploadRequestSlotPacketGenerator;
-import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
@@ -63,29 +60,18 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
             file.setExpectedSize(inputStreamAndExpectedSize.second);
 
             Logging.d("httpupload", "Requesting upload slot for file upload");
-            Jid host = this.getHost(account);
-            if (null != host) {
-                IqPacket request = HttpUploadRequestSlotPacketGenerator.generate(host, file.getName(), file.getSize(), file.getMimeType());
+            IqPacket request = HttpUploadRequestSlotPacketGenerator.generate(account, message.getContact().getJid(), file.getName(), file.getSize(), file.getMimeType());
             XmppSendUtil.sendIqPacket(account, request, new HttpUploadSlotRequestReceived(entity));
             MessageUtil.markMessage(message, Message.STATUS_UNSEND);
 
             Logging.d("httpupload", "Upload slot for file upload requested");
             started = true;
-            }
         } catch (FileNotFoundException e) {
             Logging.e("httpupload", "Could not find file, exception message: " + e.getMessage());
         }
         return started;
     }
 
-    private Jid getHost(Account account) {
-        Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
-        if (null == host) {
-            host = account.getXmppConnection().findDiscoItemByFeature(HttpUpload.NAMESPACE);
-        }
-        return host;
-    }
-
     /**
      * Checks whether a message can be sent using this service or not.
      *
@@ -99,6 +85,7 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
                 && null != message.getConversation().getAccount()
                 && null != message.getFileParams()
                 && message.needsUploading()
-                && AccountUtil.isHttpUploadAvailable(message.getConversation().getAccount(), message.getFileParams().getSize());
+                && (AccountUtil.isHttpUploadAvailable(message.getConversation().getAccount(), message.getFileParams().getSize())
+                    || AccountUtil.isFileTransferHttpAvailable(message.getConversation().getAccount()));
     }
 }