diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-10-20 21:31:05 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-10-20 21:31:05 +0200 |
| commit | 5bb746de733ee40703cea2e3faf013e74a78cee1 (patch) | |
| tree | b0a488b79e83730e954cb8b3df29dd59c4bb408b /src/main/java/de/pixart/messenger/ui | |
| parent | 80ee9306fe77578d0e6fdbf314f3789d241d61b6 (diff) | |
show cancelled instead of delivery failed if user requested to abort transfer
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index 788c8553e..bc65fd68a 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -275,7 +275,11 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie if (isResendable && file.exists()) { info = getContext().getString(R.string.send_failed_resend); } else { - info = getContext().getString(R.string.send_failed); + if (Message.ERROR_MESSAGE_CANCELLED.equals(message.getErrorMessage())) { + info = getContext().getString(R.string.cancelled); + } else { + info = getContext().getString(R.string.send_failed); + } } error = true; break; |