aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-10 10:32:25 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-10 10:32:25 +0200
commite542dd39233217b0e3cdc77628c3486e80d4581b (patch)
treeadfd176ce77bb9cf59f4f33a784386e2e0f25005 /src/main
parent549be9bb3df86dfd7aea819b8f64508ec55d9322 (diff)
always show download button when link is encrypted
dont check for known mime type
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java6
1 files changed, 1 insertions, 5 deletions
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;