diff options
author | George Mount <mount@google.com> | 2012-10-30 11:35:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-30 11:35:54 -0700 |
commit | fffab335ac447da86e7f54211b6415b49d096f85 (patch) | |
tree | e5403963f94e6db2dbc48e39b1a5de2155f04fe9 | |
parent | 9062c85907bb49a30dd7554506a607b7405c4a35 (diff) | |
parent | 883295bc3643c5d3e0520fa317bec9919cc4ff7c (diff) | |
download | android_packages_apps_Snap-fffab335ac447da86e7f54211b6415b49d096f85.tar.gz android_packages_apps_Snap-fffab335ac447da86e7f54211b6415b49d096f85.tar.bz2 android_packages_apps_Snap-fffab335ac447da86e7f54211b6415b49d096f85.zip |
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit 'aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
-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); |