commit bd47a5c6bcdcb127adb13c454fec00d4989c50b6
author Chih-Chung Chang <chihchung@google.com> Tue Oct 18 19:54:31 2011 +0800
committer Chih-Chung Chang <chihchung@google.com> Wed Oct 19 11:07:06 2011 +0800
tree a8b27c18723e21ea97b09cd9d854f3d1d91b28c4
parent c4d4922645bbd1fdfed782f452801be52834374f

Fix 5352588: Accept view intent without URI.

Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694

src/com/android/gallery3d/util/GalleryUtils.java

diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index df29a5e..fcb27ba 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -53,6 +53,8 @@
     private static final String MIME_TYPE_IMAGE = "image/*";
     private static final String MIME_TYPE_VIDEO = "video/*";
     private static final String MIME_TYPE_ALL = "*/*";
+    private static final String DIR_TYPE_IMAGE = "vnd.android.cursor.dir/image";
+    private static final String DIR_TYPE_VIDEO = "vnd.android.cursor.dir/video";
 
     private static final String PREFIX_PHOTO_EDITOR_UPDATE = "editor-update-";
     private static final String PREFIX_HAS_PHOTO_EDITOR = "has-editor-";
@@ -277,24 +279,22 @@
     public static int determineTypeBits(Context context, Intent intent) {
         int typeBits = 0;
         String type = intent.resolveType(context);
-        if (intent.getBooleanExtra(Intent.EXTRA_LOCAL_ONLY, false)) {
-            if (MIME_TYPE_ALL.equals(type)) {
-                typeBits = DataManager.INCLUDE_LOCAL_ALL_ONLY;
-            } else if (MIME_TYPE_IMAGE.equals(type)) {
-                typeBits = DataManager.INCLUDE_LOCAL_IMAGE_ONLY;
-            } else if (MIME_TYPE_VIDEO.equals(type)) {
-                typeBits = DataManager.INCLUDE_LOCAL_VIDEO_ONLY;
-            }
+
+        if (MIME_TYPE_ALL.equals(type)) {
+            typeBits = DataManager.INCLUDE_ALL;
+        } else if (MIME_TYPE_IMAGE.equals(type) ||
+                DIR_TYPE_IMAGE.equals(type)) {
+            typeBits = DataManager.INCLUDE_IMAGE;
+        } else if (MIME_TYPE_VIDEO.equals(type) ||
+                DIR_TYPE_VIDEO.equals(type)) {
+            typeBits = DataManager.INCLUDE_VIDEO;
         } else {
-            if (MIME_TYPE_ALL.equals(type)) {
-                typeBits = DataManager.INCLUDE_ALL;
-            } else if (MIME_TYPE_IMAGE.equals(type)) {
-                typeBits = DataManager.INCLUDE_IMAGE;
-            } else if (MIME_TYPE_VIDEO.equals(type)) {
-                typeBits = DataManager.INCLUDE_VIDEO;
-            }
+            typeBits = DataManager.INCLUDE_ALL;
         }
-        if (typeBits == 0) typeBits = DataManager.INCLUDE_ALL;
+
+        if (intent.getBooleanExtra(Intent.EXTRA_LOCAL_ONLY, false)) {
+            typeBits |= DataManager.INCLUDE_LOCAL_ONLY;
+        }
 
         return typeBits;
     }