introduces cancel status for file transfers, fixes NPE in file sharing after picture resize

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
index 55fd1b8e..709b3f20 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
@@ -5,6 +5,7 @@ import android.net.Uri;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.crypto.PgpEngine;
 import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
@@ -45,6 +46,9 @@ public class ConversationUtil {
         }
         message.setCounterpart(conversation.getNextCounterpart());
         //message.setType(Message.TYPE_FILE);
+        if (null == message.getFileParams()) {
+            message.setFileParams(new FileParams());
+        }
         message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD);
         String path = FileUtils.getPath(uri);
         if (path != null) {