Fix 5611147 attachments (picture) can't be viewed after they're saved

Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069

2 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/data/MediaItem.java b/src/com/android/gallery3d/data/MediaItem.java
index b34a8c8a5..13612321c 100644
--- a/src/com/android/gallery3d/data/MediaItem.java
+++ b/src/com/android/gallery3d/data/MediaItem.java
@@ -36,6 +36,8 @@ public abstract class MediaItem extends MediaObject {
     public static final int IMAGE_WAIT = 1;
     public static final int IMAGE_ERROR = -1;
 
+    public static final String MIME_TYPE_JPEG = "image/jpeg";
+
     // TODO: fix default value for latlng and change this.
     public static final double INVALID_LATLNG = 0f;
 
diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java
index b8691dfdf..8f91cc036 100644
--- a/src/com/android/gallery3d/data/UriImage.java
+++ b/src/com/android/gallery3d/data/UriImage.java
@@ -70,7 +70,7 @@ public class UriImage extends MediaItem {
             String extension =
                     MimeTypeMap.getFileExtensionFromUrl(uri.toString());
             String type = MimeTypeMap.getSingleton()
-                    .getMimeTypeFromExtension(extension);
+                    .getMimeTypeFromExtension(extension.toLowerCase());
             if (type != null) return type;
         }
         return mApplication.getContentResolver().getType(uri);
@@ -106,7 +106,7 @@ public class UriImage extends MediaItem {
                 || ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)
                 || ContentResolver.SCHEME_FILE.equals(scheme)) {
             try {
-                if (mContentType.equalsIgnoreCase("image/jpeg")) {
+                if (MIME_TYPE_JPEG.equalsIgnoreCase(mContentType)) {
                     InputStream is = mApplication.getContentResolver()
                             .openInputStream(mUri);
                     mRotation = Exif.getOrientation(is);
@@ -129,7 +129,7 @@ public class UriImage extends MediaItem {
                     Log.w(TAG, "download failed " + url);
                     return STATE_ERROR;
                 }
-                if (mContentType.equalsIgnoreCase("image/jpeg")) {
+                if (MIME_TYPE_JPEG.equalsIgnoreCase(mContentType)) {
                     InputStream is = new FileInputStream(mCacheEntry.cacheFile);
                     mRotation = Exif.getOrientation(is);
                     Utils.closeSilently(is);
@@ -253,7 +253,9 @@ public class UriImage extends MediaItem {
             details.addDetail(MediaDetails.INDEX_WIDTH, mWidth);
             details.addDetail(MediaDetails.INDEX_HEIGHT, mHeight);
         }
-        details.addDetail(MediaDetails.INDEX_MIMETYPE, mContentType);
+        if (mContentType != null) {
+            details.addDetail(MediaDetails.INDEX_MIMETYPE, mContentType);
+        }
         if (ContentResolver.SCHEME_FILE.equals(mUri.getScheme())) {
             String filePath = mUri.getPath();
             details.addDetail(MediaDetails.INDEX_PATH, filePath);