Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b6848e authored by jinwu's avatar jinwu Committed by Arne Coucheron
Browse files

Gallery2: Fix can't parse documents uri 

If other apps pass the documents uri to gallery, and the os
version is >= KK, we need to parse it and get the right uri
to use.

Change-Id: I9049dcc91de856f14a5f40991c421896786b7a58
CRs-Fixed: 2017769
parent eceb1edb

src/com/android/gallery3d/filtershow/cache/ImageLoader.java

100644 → 100755
+94 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.gallery3d.filtershow.cache;



import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.Context;

import android.content.res.Resources;

import android.database.Cursor;
@@ -29,6 +30,9 @@ import android.graphics.Matrix; 
import android.graphics.Paint;

import android.graphics.Rect;

import android.net.Uri;

import android.os.Build;

import android.os.Environment;

import android.provider.DocumentsContract;

import android.provider.MediaStore;

import android.util.Log;

import android.webkit.MimeTypeMap;
@@ -82,13 +86,97 @@ public final class ImageLoader { 
    }



    public static String getLocalPathFromUri(Context context, Uri uri) {

        Cursor cursor = context.getContentResolver().query(uri,

                new String[]{MediaStore.Images.Media.DATA}, null, null, null);

        if (cursor == null) {



        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;



        // DocumentProvider

        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {

            // ExternalStorageProvider

            if (isExternalStorageDocument(uri)) {

                final String docId = DocumentsContract.getDocumentId(uri);

                final String[] split = docId.split(":");

                final String type = split[0];



                if ("primary".equalsIgnoreCase(type)) {

                    return Environment.getExternalStorageDirectory() + "/" + split[1];

                }

            }

            // DownloadsProvider

            else if (isDownloadsDocument(uri)) {



                final String id = DocumentsContract.getDocumentId(uri);

                final Uri contentUri = ContentUris.withAppendedId(

                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));



                return getDataColumn(context, contentUri, null, null);

            }

            // MediaProvider

            else if (isMediaDocument(uri)) {

                final String docId = DocumentsContract.getDocumentId(uri);

                final String[] split = docId.split(":");

                final String type = split[0];



                Uri contentUri = null;

                if ("image".equals(type)) {

                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;

                } else if ("video".equals(type)) {

                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;

                } else if ("audio".equals(type)) {

                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;

                }



                final String selection = "_id=?";

                final String[] selectionArgs = new String[] { split[1] };



                return getDataColumn(context, contentUri, selection, selectionArgs);

            }

        }

        return getDataColumn(context, uri, null, null);

    }



    public static String getDataColumn(Context context, Uri uri, String selection,

                                       String[] selectionArgs) {



        Cursor cursor = null;

        final String column = "_data";

        final String[] projection = { column };



        try {

            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,

                    null);

            if (cursor != null && cursor.moveToFirst()) {

                final int index = cursor.getColumnIndexOrThrow(column);

                return cursor.getString(index);

            }

        } finally {

            if (cursor != null)

                cursor.close();

        }

        return null;

    }

        int index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);

        return cursor.moveToFirst() ? cursor.getString(index) : null;



    /**

     * @param uri The Uri to check.

     * @return Whether the Uri authority is ExternalStorageProvider.

     */

    public static boolean isExternalStorageDocument(Uri uri) {

        return "com.android.externalstorage.documents".equals(uri.getAuthority());

    }



    /**

     * @param uri The Uri to check.

     * @return Whether the Uri authority is DownloadsProvider.

     */

    public static boolean isDownloadsDocument(Uri uri) {

        return "com.android.providers.downloads.documents".equals(uri.getAuthority());

    }



    /**

     * @param uri The Uri to check.

     * @return Whether the Uri authority is MediaProvider.

     */

    public static boolean isMediaDocument(Uri uri) {

        return "com.android.providers.media.documents".equals(uri.getAuthority());

    }



    /**