CB-2093: NullPointerException when attaching image from Gallery that …

…contains spaces in the path Guarding against a null string being passed into FileUtils.getMimeType()
devgeeks · Jan 9, 2013 · a1cfe87 · a1cfe87
1 parent c130396
commit a1cfe87
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/framework/src/org/apache/cordova/FileUtils.java b/framework/src/org/apache/cordova/FileUtils.java
@@ -1019,15 +1019,19 @@ public String readAsDataURL(String filename, int start, int end) throws FileNotF
      * @return a mime type
      */
     public static String getMimeType(String filename) {
-        // Stupid bug in getFileExtensionFromUrl when the file name has a space
-        // So we need to replace the space with a url encoded %20
-        String url = filename.replace(" ", "%20");
-        MimeTypeMap map = MimeTypeMap.getSingleton();
-        String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension.toLowerCase().equals("3ga")) {
-            return "audio/3gpp";
+        if (filename != null) {
+            // Stupid bug in getFileExtensionFromUrl when the file name has a space
+            // So we need to replace the space with a url encoded %20
+            String url = filename.replace(" ", "%20");
+            MimeTypeMap map = MimeTypeMap.getSingleton();
+            String extension = MimeTypeMap.getFileExtensionFromUrl(url);
+            if (extension.toLowerCase().equals("3ga")) {
+                return "audio/3gpp";
+            } else {
+                return map.getMimeTypeFromExtension(extension);
+            }
         } else {
-            return map.getMimeTypeFromExtension(extension);
+            return "";
         }
     }