Browse Source

Merge pull request #1888 from nextcloud/mimetypeLowercase

MIME type lookup assumes to have lowercase MIME types
Mario Đanić 7 years ago
parent
commit
f656d4b277
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/main/java/com/owncloud/android/utils/UriUtils.java

+ 3 - 1
src/main/java/com/owncloud/android/utils/UriUtils.java

@@ -32,6 +32,8 @@ import android.webkit.MimeTypeMap;
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.util.Locale;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 
@@ -218,7 +220,7 @@ public class UriUtils {
                 // Add best possible extension
                 int index = displayName.lastIndexOf('.');
                 if (index == -1 || MimeTypeMap.getSingleton().
-                        getMimeTypeFromExtension(displayName.substring(index + 1)) == null) {
+                        getMimeTypeFromExtension(displayName.substring(index + 1).toLowerCase(Locale.ROOT)) == null) {
                     String mimeType = context.getContentResolver().getType(uri);
                     String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
                     if (extension != null) {