fix(android): getInputStream around "content://" paths (#10469)

farfromrefug · web-flow · commit 41759c189ccc · 2024-01-19T10:47:59.000-08:00
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java
@@ -358,13 +358,13 @@ public long getLastModified() {
 
 	private InputStream getInputStream(Context context, Uri uri) throws Exception {
 		if (Build.VERSION.SDK_INT >= 19) {
+			if (DocumentsContract.isDocumentUri(context, uri)) {
+				return context.getContentResolver().openInputStream(DocumentFile.fromSingleUri(context, uri).getUri());
+			}
 			if (isExternalStorageDocument(uri)) {
 				File file = getFile(context, uri);
 				return new FileInputStream(file);
 			}
-			if (DocumentsContract.isDocumentUri(context, uri)) {
-				return context.getContentResolver().openInputStream(DocumentFile.fromSingleUri(context, uri).getUri());
-			}
 		}
 		return context.getContentResolver().openInputStream(uri);
 	}

Original file line number	Diff line number	Diff line change
`@@ -358,13 +358,13 @@ public long getLastModified() {`
`358`	`358`
`359`	`359`	`private InputStream getInputStream(Context context, Uri uri) throws Exception {`
`360`	`360`	`if (Build.VERSION.SDK_INT >= 19) {`
	`361`	`+ if (DocumentsContract.isDocumentUri(context, uri)) {`
	`362`	`+ return context.getContentResolver().openInputStream(DocumentFile.fromSingleUri(context, uri).getUri());`
	`363`	`+ }`
`361`	`364`	`if (isExternalStorageDocument(uri)) {`
`362`	`365`	`File file = getFile(context, uri);`
`363`	`366`	`return new FileInputStream(file);`
`364`	`367`	`}`
`365`		`- if (DocumentsContract.isDocumentUri(context, uri)) {`
`366`		`- return context.getContentResolver().openInputStream(DocumentFile.fromSingleUri(context, uri).getUri());`
`367`		`- }`
`368`	`368`	`}`
`369`	`369`	`return context.getContentResolver().openInputStream(uri);`
`370`	`370`	`}`