From e542dd39233217b0e3cdc77628c3486e80d4581b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 10 May 2016 10:32:25 +0200 Subject: always show download button when link is encrypted dont check for known mime type --- src/main/java/eu/siacs/conversations/entities/Message.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index f6a45533..225d0531 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -631,11 +631,7 @@ public class Message extends AbstractEntity { boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}"); if (encrypted) { - if (MimeUtils.guessMimeTypeFromExtension(extension) != null) { - return Decision.MUST; - } else { - return Decision.NEVER; - } + return Decision.MUST; } else if (Transferable.VALID_IMAGE_EXTENSIONS.contains(extension) || Transferable.WELL_KNOWN_EXTENSIONS.contains(extension)) { return Decision.SHOULD; -- cgit v1.2.3