Display deleted message just like un-downloaded message

Stephen Paul Weber created

Change summary

src/main/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(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java 🔗 

@@ -1035,7 +1035,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         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);

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) {