diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-29 11:31:03 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-29 11:31:03 +0100 |
| commit | 03593ba56fe0a15312e3ae231dfdaf3be6c7548a (patch) | |
| tree | f3ca3a45423f3730fe530836a4e517c216d888b4 /src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | 64209829f779214ae7fc0c6ab35de4d006c745c4 (diff) | |
proper error state for images
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 2b4263e8..a24f90d7 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -100,6 +100,9 @@ public class MessageAdapter extends ArrayAdapter<Message> { if (params.size != 0) { filesize = params.size / 1024 + " KB"; } + if (message.getDownloadable() != null && message.getDownloadable().getStatus() == Downloadable.STATUS_FAILED) { + error = true; + } } switch (message.getMergedStatus()) { case Message.STATUS_WAITING: @@ -125,10 +128,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { info = getContext().getString(R.string.send_failed); error = true; break; - case Message.STATUS_SEND_REJECTED: - info = getContext().getString(R.string.send_rejected); - error = true; - break; default: if (multiReceived) { Contact contact = message.getContact(); @@ -484,6 +483,8 @@ public class MessageAdapter extends ArrayAdapter<Message> { && d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) { displayDownloadableMessage(viewHolder, item, R.string.check_image_filesize); + } else if (d != null && d.getStatus() == Downloadable.STATUS_FAILED) { + displayInfoMessage(viewHolder, R.string.image_transmission_failed); } else if ((item.getEncryption() == Message.ENCRYPTION_DECRYPTED) || (item.getEncryption() == Message.ENCRYPTION_NONE) || (item.getEncryption() == Message.ENCRYPTION_OTR)) { |