From 34fcdda53fa8ae1174909b62860534d2d874eb72 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Thu, 29 Sep 2016 11:57:16 +0200
Subject: Implements FS#235: Deletion of remote files uploaded via httpupload

---
 .../filetransfer/http/upload/HttpFileTransferEntity.java      | 11 ++++++++++-
 .../services/filetransfer/http/upload/HttpFileUploader.java   |  1 +
 .../http/upload/HttpUploadFileTransferService.java            |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload')

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java
index fbe7186b..a373d584 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java
@@ -6,7 +6,9 @@ import java.net.URL;
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.services.filetransfer.FileTransferEntity;
 import de.thedevstack.conversationsplus.services.filetransfer.FileTransferFailureReason;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
@@ -24,7 +26,13 @@ public class HttpFileTransferEntity extends FileTransferEntity {
     public HttpFileTransferEntity(Message message, boolean delayed) {
         super(message);
         this.getMessage().setHttpUploaded(true);
-        this.getMessage().setNoDownloadable();
+        this.getMessage().setNoDownloadable(); // TODO Set rmeote file status to uploaded
+        FileParams fileParams = this.getMessage().getFileParams();
+        if (null == fileParams) {
+            fileParams = new FileParams();
+        }
+        fileParams.setFileStatus(FileStatus.NEEDS_UPLOAD);
+        this.getMessage().setFileParams(fileParams);
         if (Config.ENCRYPT_ON_HTTP_UPLOADED
                 || message.getEncryption() == Message.ENCRYPTION_AXOLOTL
                 || message.getEncryption() == Message.ENCRYPTION_OTR) {
@@ -77,6 +85,7 @@ public class HttpFileTransferEntity extends FileTransferEntity {
                 getUrl = new URL(getUrl.toString() + "#" + CryptoHelper.bytesToHex(this.getKey()));
             }
 
+            this.getMessage().getFileParams().setFileStatus(FileStatus.UPLOADED);
             MessageUtil.updateFileParams(this.getMessage(), getUrl);
         } catch (MalformedURLException e) {
             Logging.e("httpupload", "Not a valid get url");
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
index 318a8b8f..8cae599c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
@@ -84,6 +84,7 @@ public class HttpFileUploader implements Runnable {
 
                 // Send the URL to the counterpart
                 Message message = this.entity.getMessage();
+                message.setBody(this.entity.getGetUrl());
                 message.setCounterpart(message.getConversation().getJid().toBareJid());
                 if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
                     XmppConnectionServiceAccessor.xmppConnectionService.getPgpEngine().encrypt(message, new HttpUploadedFileEncryptionUiCallback(this.entity));
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 f08e27f5..6b19cd5f 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
@@ -86,6 +86,7 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
         return null != message
                 && null != message.getConversation()
                 && null != message.getConversation().getAccount()
-                && message.getConversation().getAccount().httpUploadAvailable(FileBackend.getFile(message, false).getSize());
+                && null != message.getFileParams()
+                && message.getConversation().getAccount().httpUploadAvailable(message.getFileParams().getSize());
     }
 }
-- 
cgit v1.2.3