Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
index 958e9de8..25c8b3ba 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
@@ -3,6 +3,7 @@ package de.thedevstack.conversationsplus.utils;
 import android.net.Uri;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
 
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -45,10 +46,12 @@ public class ConversationUtil {
             message = new Message(conversation, "", conversation.getNextEncryption());
         }
         message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_FILE);
+        //message.setType(Message.TYPE_FILE);
+        message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD);
         String path = FileUtils.getPath(uri);
         if (path != null) {
-            message.setRelativeFilePath(path);
+            message.getFileParams().setPath(path);
+            message.setRelativeFilePath(path); // TODO: Remove when everything is moved to fileparams
             MessageUtil.updateFileParams(message);
             if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
                 PgpEngine.getInstance().encrypt(message, callback);