From f45ad10b1baaf09fd4a40d6b63d1cd093623eedc Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 6 Jun 2016 09:05:50 +0200
Subject: Related to FS#131, FS#129, FS#220: - FileTransferFailureReason
 including types introduced. A failure can be recoverable, non-recoverable or
 limited recoverable - in case file transfer with the highest weight factor
 fails, the next file transfer method is used - improved logging - javadoc
 comments added

---
 .../httpupload/HttpFileTransferEntity.java         | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpFileTransferEntity.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpFileTransferEntity.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpFileTransferEntity.java
index 8efd498b..a8e5734f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpFileTransferEntity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpFileTransferEntity.java
@@ -1,9 +1,16 @@
 package de.thedevstack.conversationsplus.services.filetransfer.httpupload;
 
+import java.net.MalformedURLException;
+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.Message;
 import de.thedevstack.conversationsplus.services.filetransfer.FileTransferEntity;
+import de.thedevstack.conversationsplus.services.filetransfer.FileTransferFailureReason;
+import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.xmpp.httpupload.HttpUploadSlot;
 
 /**
@@ -49,4 +56,32 @@ public class HttpFileTransferEntity extends FileTransferEntity {
     public boolean isDelayed() {
         return this.delayed;
     }
+
+    @Override
+    public void fail(FileTransferFailureReason failureReason) {
+        this.getMessage().setHttpUploaded(false);
+        super.fail(failureReason);
+    }
+
+    @Override
+    public void cancel() {
+        this.getMessage().setHttpUploaded(false);
+        super.cancel();
+    }
+
+    @Override
+    public void transferred() {
+        try {
+            URL getUrl = new URL(this.getGetUrl());
+            if (this.getKey() != null) {
+                getUrl = new URL(getUrl.toString() + "#" + CryptoHelper.bytesToHex(this.getKey()));
+            }
+
+            MessageUtil.updateFileParams(this.getMessage(), getUrl);
+        } catch (MalformedURLException e) {
+            Logging.e("httpupload", "Not a valid get url");
+        }
+
+        super.transferred();
+    }
 }
-- 
cgit v1.2.3