aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-02 23:19:50 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-02 23:19:50 +0200
commite4d1bd415dcd61013005075af3e6a03b9de24d74 (patch)
treebafd76cf244bffde3d0734ff083d3053375ec14a /src
parentf5ba9d4223ca8e5dc9ce00024f69a8374d170a31 (diff)
also offer http download for some 'well known extensions'
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Downloadable.java2
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Downloadable.java b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
index c32165e8..8fae91bb 100644
--- a/src/main/java/eu/siacs/conversations/entities/Downloadable.java
+++ b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
@@ -4,6 +4,7 @@ public interface Downloadable {
String[] VALID_IMAGE_EXTENSIONS = {"webp", "jpeg", "jpg", "png", "jpe"};
String[] VALID_CRYPTO_EXTENSIONS = {"pgp", "gpg", "otr"};
+ String[] WELL_KNOWN_EXTENSIONS = {"pdf","m4a"};
int STATUS_UNKNOWN = 0x200;
int STATUS_CHECKING = 0x201;
@@ -14,6 +15,7 @@ public interface Downloadable {
int STATUS_OFFER_CHECK_FILESIZE = 0x206;
int STATUS_UPLOADING = 0x207;
+
boolean start();
int getStatus();
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index d15f3bbd..ac5a9d56 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -497,7 +497,8 @@ public class Message extends AbstractEntity {
} else {
return Decision.NEVER;
}
- } else if (Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(extension)) {
+ } else if (Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(extension)
+ || Arrays.asList(Downloadable.WELL_KNOWN_EXTENSIONS).contains(extension)) {
return Decision.SHOULD;
} else {
return Decision.NEVER;