1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
index 63f1547f..62fed29b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
@@ -9,6 +9,7 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.enums.FileStatus;
+import de.thedevstack.conversationsplus.enums.MessageStatus;
 import de.thedevstack.conversationsplus.services.FileTransferService;
 import de.thedevstack.conversationsplus.services.filetransfer.http.upload.HttpUploadFileTransferEntity;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
@@ -124,9 +125,8 @@ public class FileTransferManager implements FileTransferStatusListener {
                     }
                 }
             }
-            if (!retransferStarted) {
-                entity.getMessage().getFileParams().setFileStatus(FileStatus.UPLOAD_FAILED);
-                MessageUtil.markMessage(entity.getMessage(), Message.STATUS_SEND_FAILED);
+            if (!retransferStarted && (entity instanceof HttpUploadFileTransferEntity)) {
+                MessageUtil.setAndSaveFileStatus(entity.getMessage(), FileStatus.UPLOAD_FAILED);
             }
         }
     }
@@ -134,12 +134,13 @@ public class FileTransferManager implements FileTransferStatusListener {
     @Override
     public void onCancel(FileTransferEntity entity) {
         this.activeTransfers.remove(entity.getMessage().getUuid());
-        MessageUtil.markMessage(entity.getMessage(), Message.STATUS_SEND_CANCELED);
+        MessageUtil.setAndSaveMessageStatus(entity.getMessage(), MessageStatus.CANCELED);
     }
 
     @Override
     public void onSuccess(FileTransferEntity entity) {
         this.activeTransfers.remove(entity.getMessage().getUuid());
+        MessageUtil.setAndSaveMessageStatus(entity.getMessage(), MessageStatus.TRANSMITTED);
     }
 
     private boolean startFileTransfer(Message message, boolean delayed, WeightedTransferService wts) {