diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 21:06:58 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 21:06:58 +0200 |
| commit | deb9c20e5e7459c56f5207f3eaf9c189e383475a (patch) | |
| tree | edd52471eec291e785bafaef317e2c9b852bf5bf | |
| parent | 91a3cee6d2ddcb647082b517d2781c00fb1f844d (diff) | |
| parent | 5a53ff80fbaafb405f88cb4949bb46d8ffc450cc (diff) | |
Merge branch 'master' into developmentdevelopment
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/MimeUtils.java | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 279fada1..08005425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 1.6.3 +* bug fixes + ####Version 1.6.2 * fixed issues with connection time out when server does not support ping diff --git a/build.gradle b/build.gradle index c5fb8381..a434faab 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 86 + versionCode 87 versionName "1.7.0-alpha" } diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java index a9e89d1b..d4544424 100644 --- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java @@ -458,7 +458,7 @@ public final class MimeUtils { if (extension == null || extension.isEmpty()) { return null; } - return extensionToMimeTypeMap.get(extension); + return extensionToMimeTypeMap.get(extension.toLowerCase()); } /** * Returns true if the given extension has a registered MIME type. |