mark deleted files in database and not query them when querying for media

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java
index 03af31e23..6ac5ae39d 100644
--- a/src/main/java/de/pixart/messenger/utils/UIHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java
@@ -263,8 +263,6 @@ public class UIHelper {
                 case Transferable.STATUS_OFFER_CHECK_FILESIZE:
                     return new Pair<>(context.getString(R.string.x_file_offered_for_download,
                             getFileDescriptionString(context, message)), true);
-                case Transferable.STATUS_DELETED:
-                    return new Pair<>(context.getString(R.string.file_deleted), true);
                 case Transferable.STATUS_FAILED:
                     return new Pair<>(context.getString(R.string.file_transmission_failed), true);
                 case Transferable.STATUS_UPLOADING:
@@ -278,6 +276,8 @@ 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) {
@@ -286,7 +286,7 @@ public class UIHelper {
             return new Pair<>(context.getString(R.string.not_encrypted_for_this_device), true);
         } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_FAILED) {
             return new Pair<>(context.getString(R.string.omemo_decryption_failed), true);
-        } else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
+        } else if (message.isFileOrImage()) {
             return new Pair<>(getFileDescriptionString(context, message), true);
         } else {
             final String body = MessageUtils.filterLtrRtl(message.getBody());