From f71d9deb5e1261f836c91d6983b27bf7a9bcb914 Mon Sep 17 00:00:00 2001 From: macdonst Date: Wed, 5 Jan 2011 02:42:52 +0800 Subject: [PATCH] Fixing mimetypes for content:// Uri's. --- framework/src/com/phonegap/FileUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/framework/src/com/phonegap/FileUtils.java b/framework/src/com/phonegap/FileUtils.java index 8ef3440b..37fa0fea 100755 --- a/framework/src/com/phonegap/FileUtils.java +++ b/framework/src/com/phonegap/FileUtils.java @@ -220,10 +220,14 @@ public class FileUtils extends Plugin { } // Determine content type from file name - MimeTypeMap map = MimeTypeMap.getSingleton(); - String contentType = map.getMimeTypeFromExtension(map.getFileExtensionFromUrl(filename)); - if (contentType == null && filename.startsWith("content")) { - contentType = "image/jpeg"; + String contentType = null; + if (filename.startsWith("content:")) { + Uri fileUri = Uri.parse(filename); + contentType = this.ctx.getContentResolver().getType(fileUri); + } + else { + MimeTypeMap map = MimeTypeMap.getSingleton(); + contentType = map.getMimeTypeFromExtension(map.getFileExtensionFromUrl(filename)); } byte[] base64 = Base64.encodeBase64(bos.toByteArray());