diff options
author | steckbrief <steckbrief@chefmail.de> | 2018-02-16 21:04:29 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2018-02-16 21:04:29 +0100 |
commit | 62bc6885db07423a434f945de9def863cb12b8c1 (patch) | |
tree | 0d60daca06a78d11546c02083c29f826581ae179 /src/main/java/de/thedevstack/conversationsplus/ui/listeners | |
parent | 84a2f8e41ac4d5a7ebc24f4eb5b99e9bc3029f1f (diff) |
introduces cancel status for file transfers, fixes NPE in file sharing after picture resize
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/listeners')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | 3 |
1 files changed, 3 insertions, 0 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()); } + 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); |