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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
index 68d2e47c..e6ec7496 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -119,7 +119,10 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
         } else {
             message = new Message(conversation, "", conversation.getNextEncryption());
         }
-        message.setCounterpart(conversation.getNextCounterpart());
+        if (null != conversation.getNextCounterpart() && null == message.getCounterpart()) {
+            message.setCounterpart(conversation.getNextCounterpart());
+        }
+
         //message.setType(Message.TYPE_IMAGE);
         message.setFileParams(new FileParams());
         message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD);