Implements FS#235: Deletion of remote files uploaded via httpupload

1 files changed, 8 insertions, 3 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 2b26fd85..eb9f1b04 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
@@ -1,8 +1,13 @@
 package de.thedevstack.conversationsplus.services.filetransfer.http.delete;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.enums.FileStatus;
+import de.thedevstack.conversationsplus.persistance.DatabaseBackend;
 import de.thedevstack.conversationsplus.ui.listeners.SimpleUserDecisionCallback;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.delete.FileTransferHttpDeleteSlotRequestPacketGenerator;
@@ -10,7 +15,7 @@ import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
- * Created by steckbrief on 21.08.2016.
+ *
  */
 public class DeleteRemoteFileService implements SimpleUserDecisionCallback {
     private Message message;
@@ -23,14 +28,14 @@ public class DeleteRemoteFileService implements SimpleUserDecisionCallback {
         if (this.message.isHttpUploaded()) {
             String path = this.message.getBody();
             if (this.message.hasFileOnRemoteHost()) {
-                path = this.message.getFileParams().url.toString();
+                path = this.message.getFileParams().getUrl();
             }
 
             DeleteRemoteFile remoteFile = new DeleteRemoteFile(path, this.message);
             Account account = this.message.getConversation().getAccount();
             Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
             IqPacket request = FileTransferHttpDeleteSlotRequestPacketGenerator.generate(host, path);
-
+            MessageUtil.setAndSaveFileStatus(this.message, FileStatus.DELETING);
             XmppSendUtil.sendIqPacket(account, request, new DeleteTokenReceived(remoteFile));
         }
     }