[#15] v2.21.0-alpha.8: Android: Patches pickFile() for cancelled sele…

…ction
birdofpreyru · Oct 13, 2023 · a55ad0e · a55ad0e
1 parent 9d5f81f
commit a55ad0e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
diff --git 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",