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/services/XmppConnectionService.java | |
| 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/services/XmppConnectionService.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java index 963adfe4..bad0415f 100644 --- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java @@ -2415,7 +2415,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } public void resendFailedMessages(final Message message) { - if (message.getStatus() == Message.STATUS_SEND_FAILED) { + if (message.getStatus() == Message.STATUS_SEND_FAILED + || message.getStatus() == Message.STATUS_SEND_CANCELED) { message.setTime(System.currentTimeMillis()); MessageUtil.markMessage(message, Message.STATUS_WAITING); this.resendMessage(message, false); |