From 95405fde5f48fed8c5fab8816050209fd20a6879 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 19 Jun 2017 13:23:20 +0200 Subject: [PATCH] mark message as failed after canceling ft w/o transferable. fixes #2513 --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index d1f6cf192..0805488b0 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -805,6 +805,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); } }