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

---
 .../de/thedevstack/conversationsplus/ui/ConversationFragment.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index d25fa461..528e2a55 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -553,7 +553,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			if (treatAsFile || (GeoHelper.isGeoUri(m.getBody()))) {
 				shareWith.setVisible(true);
 			}
-			if (m.getStatus() == Message.STATUS_SEND_FAILED) {
+			if (m.getStatus() == Message.STATUS_SEND_FAILED
+                    || Message.STATUS_SEND_CANCELED == m.getStatus()) {
 				sendAgain.setVisible(true);
 			}
 			if (m.hasFileOnRemoteHost()
@@ -700,7 +701,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		if (transferable != null) {
 			transferable.cancel();
 		} else {
-			MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
+			MessageUtil.markMessage(message, Message.STATUS_SEND_CANCELED);
 		}
 	}
 
-- 
cgit v1.2.3