summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-29 14:54:17 -0700
committerGeorge Mount <mount@google.com>2012-10-29 14:54:17 -0700
commit883295bc3643c5d3e0520fa317bec9919cc4ff7c (patch)
tree05ccd14bccf8deda132871c4795960365c723ac7 /src
parent373fe6a155425c6488ab610157184633637314b4 (diff)
downloadandroid_packages_apps_Snap-883295bc3643c5d3e0520fa317bec9919cc4ff7c.tar.gz
android_packages_apps_Snap-883295bc3643c5d3e0520fa317bec9919cc4ff7c.tar.bz2
android_packages_apps_Snap-883295bc3643c5d3e0520fa317bec9919cc4ff7c.zip
Don't use an album for UriImages.
Bug 7422455 Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/data/UriSource.java32
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);