From 267178bcee073e973c5a507adee7fff6d2be8b7b Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Sat, 26 Aug 2023 20:46:56 -0500 Subject: [PATCH] Display deleted message just like un-downloaded message --- .../java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 +- src/main/java/eu/siacs/conversations/utils/UIHelper.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 479acd590c5600b4e5a238b5076e9d9ceda474fb..4ba064de815373b7e7d449a8d11141ce2fd49a82 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -1035,7 +1035,7 @@ public class MessageAdapter extends ArrayAdapter { final Transferable transferable = message.getTransferable(); final boolean unInitiatedButKnownSize = MessageUtils.unInitiatedButKnownSize(message); if (unInitiatedButKnownSize || message.isDeleted() || (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING)) { - if (unInitiatedButKnownSize || transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER) { + if (unInitiatedButKnownSize || message.isDeleted() || transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER) { displayDownloadableMessage(viewHolder, message, activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, message)), darkBackground, type); } else if (transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER_CHECK_FILESIZE) { displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_x_filesize, UIHelper.getFileDescriptionString(activity, message)), darkBackground, type); diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 1c5d1ddbe2e5cb2715d7d073b049a0f134cefe15..377409ca0bea08d730dcc72528844fe380f44eea 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -302,8 +302,6 @@ public class UIHelper { default: return new Pair<>("", false); } - } else if (message.isFileOrImage() && message.isDeleted()) { - return new Pair<>(context.getString(R.string.file_deleted), true); } else if (message.getEncryption() == Message.ENCRYPTION_PGP) { return new Pair<>(context.getString(R.string.pgp_message), true); } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {