Merge branch 'master' into development

2015-08-23 21:06:58 +02:00 · 2015-08-23 21:06:58 +02:00 · deb9c20e5e
parent 91a3cee6d2 5a53ff80fb
commit deb9c20e5e
3 changed files with 5 additions and 2 deletions
--- 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

--- 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"
 	}

--- 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.