diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-14 12:31:57 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:34:12 +0100 |
commit | e7a70a46e0154740177dcdea7fad255dcd4067e9 (patch) | |
tree | 76594b4f495b8b415b47e1d4273c64f6e15f6f60 /src/main/java/eu/siacs/conversations/entities | |
parent | 16847a30c88246381a026bce9f2435be2bd77422 (diff) |
some mime and pgp fixes for file transfer
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/DownloadableFile.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java index 6aff643a0..25f339071 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java +++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java @@ -55,13 +55,15 @@ public class DownloadableFile extends File { } public String getMimeType() { - if (mime==null) { - mime = URLConnection.guessContentTypeFromName(this.getAbsolutePath()); - if (mime == null) { - mime = ""; - } + String path = this.getAbsolutePath(); + String mime = URLConnection.guessContentTypeFromName(path); + if (mime != null) { + return mime; + } else if (mime == null && path.endsWith(".webp")) { + return "image/webp"; + } else { + return ""; } - return mime; } public void setExpectedSize(long size) { |