From 3d648b5caab8e9b3aa9ef3a666281cb10f796c30 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 24 Jun 2017 09:32:24 +0200
Subject: mark message as failed after canceling ft w/o transferable

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index d67474965..1e1b51a93 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -837,6 +837,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
         Transferable transferable = message.getTransferable();
         if (transferable != null) {
             transferable.cancel();
+        } else if (message.getStatus() != Message.STATUS_RECEIVED) {
+            activity.xmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED);
         }
     }
 
-- 
cgit v1.2.3