diff options
author | George Mount <mount@google.com> | 2012-10-29 14:54:17 -0700 |
---|---|---|
committer | George Mount <mount@google.com> | 2012-10-29 14:54:17 -0700 |
commit | 7db87e52758c2819785d71e36986080542f5ab3f (patch) | |
tree | a72d4213fcb910afd13387fe0178ddcbc264391a | |
parent | dc03ae144d838714446b239f2b0c519d956af6ff (diff) | |
download | android_packages_apps_Gallery2-7db87e52758c2819785d71e36986080542f5ab3f.tar.gz android_packages_apps_Gallery2-7db87e52758c2819785d71e36986080542f5ab3f.tar.bz2 android_packages_apps_Gallery2-7db87e52758c2819785d71e36986080542f5ab3f.zip |
Don't use an album for UriImages.
Bug 7422455
Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
-rw-r--r-- | src/com/android/gallery3d/data/UriSource.java | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/com/android/gallery3d/data/UriSource.java b/src/com/android/gallery3d/data/UriSource.java index 624747166..f66bacd7b 100644 --- a/src/com/android/gallery3d/data/UriSource.java +++ b/src/com/android/gallery3d/data/UriSource.java @@ -21,7 +21,6 @@ import android.net.Uri; import android.webkit.MimeTypeMap; import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.util.MediaSetUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -36,22 +35,6 @@ class UriSource extends MediaSource { private GalleryApp mApplication; - //Array of accepted Uri paths - private static final String[] ALLOWED_URIS = { - "content://downloads/all_downloads/" - }; - - private static boolean checkIfUriStringAllowed(String uri){ - boolean ret = false; - for(String u : ALLOWED_URIS) { - if (uri.startsWith(u)){ - ret = true; - break; - } - } - return ret; - } - public UriSource(GalleryApp context) { super("uri"); mApplication = context; @@ -88,21 +71,6 @@ class UriSource extends MediaSource { } @Override - public Path getDefaultSetOf(Path item) { - MediaObject object = mApplication.getDataManager().getMediaObject(item); - if (object instanceof UriImage) { - //Check if Uri path is for an item that should appear - //in the downloads folder (checks against ALLOWED_URIS). - String uri = ((UriImage)object).getContentUri().toString(); - if(!checkIfUriStringAllowed(uri)) - return null; - return Path.fromString("/local/all").getChild( - MediaSetUtils.DOWNLOAD_BUCKET_ID); - } - return null; - } - - @Override public Path findPathByUri(Uri uri, String type) { String mimeType = getMimeType(uri); |