aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-10 10:32:25 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-13 21:52:09 +0200
commit33572aadf2e2ad17871cad4a7260633103808c8f (patch)
tree333120dbf025b3462bba4e8b8329140e4c7ea977 /src/main
parentef7d5f557885614f92ff6dbb2bd1606da46216b7 (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 f6a45533f..225d05315 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;