From 62bc6885db07423a434f945de9def863cb12b8c1 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 16 Feb 2018 21:04:29 +0100
Subject: introduces cancel status for file transfers, fixes NPE in file
 sharing after picture resize

---
 .../thedevstack/conversationsplus/services/XmppConnectionService.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java')

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);
-- 
cgit v1.2.3