Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

CHANGELOG.md                                              | 3 +++
build.gradle                                              | 2 +-
src/main/java/eu/siacs/conversations/utils/MimeUtils.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)

Detailed changes

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
 

build.gradle

@@ -48,7 +48,7 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 86
+		versionCode 87
 		versionName "1.7.0-alpha"
 	}
 

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.