aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-06-24 09:32:24 +0200
committerChristian Schneppe <christian@pix-art.de>2017-06-24 09:32:24 +0200
commit3d648b5caab8e9b3aa9ef3a666281cb10f796c30 (patch)
tree71293ed9ec36cac1ecb05e9a7e7910865f21eb69
parent5bc4094ff4a9fe25d458ade55ae1019cb87eeab8 (diff)
mark message as failed after canceling ft w/o transferable
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java2
1 files changed, 2 insertions, 0 deletions
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);
}
}