Merge pull request #9038 from garymathews/TIMOB-24660_6_1_X

[6_1_X][TIMOB-24660] Android: Support loading downloaded images from gallery
tidev · May 9, 2017 · 72f90e9 · 72f90e9
2 parents 7aa0d0e + 28a81fd
commit 72f90e9
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/io/TitaniumBlob.java b/android/titanium/src/java/org/appcelerator/titanium/io/TitaniumBlob.java
@@ -14,8 +14,10 @@
 
 import org.appcelerator.titanium.TiApplication;
 
+import android.content.ContentUris;
 import android.database.Cursor;
 import android.net.Uri;
+import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
 public class TitaniumBlob extends TiBaseFile
@@ -51,6 +53,21 @@ protected void init() {
 					android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
 					projection, MediaStore.Images.Media._ID + " = ? ", new String[]{id}, null);
 
+				if (c.moveToNext()) {
+					name = c.getString(0);
+					path = c.getString(1);
+				}
+			} finally {
+				if (c != null) {
+					c.close();
+				}
+			}
+		}  else if (url.startsWith("content://com.android.providers.downloads.documents")) {
+			try {
+				String id = DocumentsContract.getDocumentId(Uri.parse(url));
+				Uri uri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+				c = TiApplication.getInstance().getContentResolver().query(uri, projection, null, null, null);
+
 				if (c.moveToNext()) {
 					name = c.getString(0);
 					path = c.getString(1);