Improved error handling for filetransfer:http:delete, Check for httpupload feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
index eb9f1b04..2085cf4b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
@@ -31,14 +31,18 @@ public class DeleteRemoteFileService implements SimpleUserDecisionCallback {
                 path = this.message.getFileParams().getUrl();
             }
 
+            if (null != path) {
                 DeleteRemoteFile remoteFile = new DeleteRemoteFile(path, this.message);
                 Account account = this.message.getConversation().getAccount();
                 Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
+                if (null != host) {
                     IqPacket request = FileTransferHttpDeleteSlotRequestPacketGenerator.generate(host, path);
                     MessageUtil.setAndSaveFileStatus(this.message, FileStatus.DELETING);
                     XmppSendUtil.sendIqPacket(account, request, new DeleteTokenReceived(remoteFile));
                 }
             }
+        }
+    }
 
     @Override
     public void onYes() {