From e6a3ff392decbe42a25ce23f538827211427a98a Mon Sep 17 00:00:00 2001 From: Jonathan Stopchick Date: Tue, 15 Nov 2022 13:07:06 -0800 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfe9dba..1105f30 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# react-native-file-picker +# GEOENGINEERS CUSTOMIZED - react-native-file-picker A React Native module that allows you to use native UI to select a file from the device library Based on [react-native-image-picker](https://github.com/marcshilling/react-native-image-picker) From a670b49e9ce6a51280d4a6befea1e46fe8d9c4ea Mon Sep 17 00:00:00 2001 From: Jonathan Stopchick Date: Tue, 15 Nov 2022 15:16:46 -0800 Subject: [PATCH 2/4] Fixed references from recent area in import KMZ --- android/src/main/java/com/filepicker/FilePickerModule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/filepicker/FilePickerModule.java b/android/src/main/java/com/filepicker/FilePickerModule.java index 74737d2..2ae46fd 100644 --- a/android/src/main/java/com/filepicker/FilePickerModule.java +++ b/android/src/main/java/com/filepicker/FilePickerModule.java @@ -280,8 +280,12 @@ else if (isDownloadsDocument(uri)) { return split[1]; } else { String prefix = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? "file:///" : "content://"; + String contentId = split[0]; + if(split.length > 1){ + contentId = split[1]; + } final Uri contentUri = ContentUris.withAppendedId( - Uri.parse(prefix + "downloads/public_downloads"), Long.valueOf(split[1])); + Uri.parse(prefix + "downloads/public_downloads"), Long.valueOf(contentId)); return getDataColumn(context, contentUri, null, null); } From 1cbf9e696f0626dd66620518018907a0f54cfce8 Mon Sep 17 00:00:00 2001 From: Jonathan Stopchick Date: Thu, 17 Nov 2022 13:58:26 -0800 Subject: [PATCH 3/4] Fixed OneDrive paths issue For someone who doesn't code in Java, I'm pretty proud I was able to figure this out. :-P --- android/src/main/java/com/filepicker/FilePickerModule.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/filepicker/FilePickerModule.java b/android/src/main/java/com/filepicker/FilePickerModule.java index 2ae46fd..ac928c0 100644 --- a/android/src/main/java/com/filepicker/FilePickerModule.java +++ b/android/src/main/java/com/filepicker/FilePickerModule.java @@ -255,8 +255,11 @@ public static String getPath(final Context context, final Uri uri) { final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + if (isExternalSkydriveResourceUri(uri)) { + //DONT DO ANYTHING? THIS RETURNS THE PATH AS IS FOR ONEDRIVE + } // DocumentProvider - if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + else if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { // ExternalStorageProvider if (isExternalStorageDocument(uri)) { From 3846cd65ce974561e452f6f5efdf49ec37e3d4da Mon Sep 17 00:00:00 2001 From: Jonathan Stopchick Date: Thu, 17 Nov 2022 14:02:48 -0800 Subject: [PATCH 4/4] Forgot to include the function! Doh --- .../src/main/java/com/filepicker/FilePickerModule.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/android/src/main/java/com/filepicker/FilePickerModule.java b/android/src/main/java/com/filepicker/FilePickerModule.java index ac928c0..142c30d 100644 --- a/android/src/main/java/com/filepicker/FilePickerModule.java +++ b/android/src/main/java/com/filepicker/FilePickerModule.java @@ -333,6 +333,14 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) { return null; } + /** + * @param uri The Uri to check. + * @return Whether the Uri authority is MediaProvider. + */ + public static boolean isExternalSkydriveResourceUri(Uri uri) { + return "com.microsoft.skydrive.content.external".equals(uri.getAuthority()); + } + /** * @param uri The Uri to check. * @return Whether the Uri authority is ExternalStorageProvider.