From a55ad0e5b6936f83e490c89a9a3b6c163a98e14e Mon Sep 17 00:00:00 2001
From: "Dr. Sergey Pogodin" <dr.pogodin@gmail.com>
Date: Fri, 13 Oct 2023 19:20:41 +0200
Subject: [PATCH] [#15] v2.21.0-alpha.8: Android: Patches pickFile() for
 cancelled selection

---
 .../com/drpogodin/reactnativefs/ReactNativeFsModule.java  | 2 +-
 example/src/App.tsx                                       | 8 +++++---
 package-lock.json                                         | 4 ++--
 package.json                                              | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java b/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java
index c6ab2bff..019fb15c 100644
--- a/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java
+++ b/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java
@@ -91,7 +91,7 @@ private ActivityResultLauncher<String[]> getPickFileLauncher() {
           @Override
           public void onActivityResult(Uri uri) {
             WritableArray res = Arguments.createArray();
-            res.pushString(uri.toString());
+            if (uri != null) res.pushString(uri.toString());
             pendingPickFilePromises.pop().resolve(res);
           }
         }
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 05da0809..542f0a03 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -25,10 +25,12 @@ export default function App() {
         <Button
           onPress={async () => {
             const res = await pickFile();
-            Alert.alert('Picked files', res.join('; '));
+            Alert.alert(`Picked ${res.length} file(s)`, res.join('; '));
 
-            const begin = await read(res[0]!, 10);
-            Alert.alert('First file starts with', begin);
+            for (let i = 0; i < res.length; ++i) {
+              const begin = await read(res[0]!, 10);
+              Alert.alert(`File #{i + 1} starts with`, begin);
+            }
           }}
           title="pickFile()"
         />
diff --git a/package-lock.json b/package-lock.json
index edbb26a0..18b6dadb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@dr.pogodin/react-native-fs",
-  "version": "2.21.0-alpha.7",
+  "version": "2.21.0-alpha.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@dr.pogodin/react-native-fs",
-      "version": "2.21.0-alpha.7",
+      "version": "2.21.0-alpha.8",
       "license": "MIT",
       "dependencies": {
         "buffer": "^6.0.3"
diff --git a/package.json b/package.json
index 23c1f3c2..cd261a9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dr.pogodin/react-native-fs",
-  "version": "2.21.0-alpha.7",
+  "version": "2.21.0-alpha.8",
   "description": "Native filesystem access for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",