Merge branch 'dev-2.21'

birdofpreyru · Oct 12, 2023 · 4a86a9f · 4a86a9f
2 parents 5f51497 + 2d39c25
commit 4a86a9f
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 108 deletions.
diff --git a/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java b/android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.java
@@ -78,26 +78,31 @@ static private void closeIgnoringException(Closeable closeable) {
 
   ReactNativeFsModule(ReactApplicationContext context) {
     super(context);
+  }
 
-    ReactActivity activity = (ReactActivity)getCurrentActivity();
-    ActivityResultRegistry registry = activity.getActivityResultRegistry();
-    pickFileLauncher = registry.register(
-      "RNFS_pickFile",
-      new OpenDocument(),
-      new ActivityResultCallback<Uri>() {
-        @Override
-        public void onActivityResult(Uri uri) {
-          WritableArray res = Arguments.createArray();
-          res.pushString(uri.toString());
-          pendingPickFilePromises.pop().resolve(res);
+  private ActivityResultLauncher<String[]> getPickFileLauncher() {
+    if (pickFileLauncher == null) {
+      ReactActivity activity = (ReactActivity)getCurrentActivity();
+      ActivityResultRegistry registry = activity.getActivityResultRegistry();
+      pickFileLauncher = registry.register(
+        "RNFS_pickFile",
+        new OpenDocument(),
+        new ActivityResultCallback<Uri>() {
+          @Override
+          public void onActivityResult(Uri uri) {
+            WritableArray res = Arguments.createArray();
+            res.pushString(uri.toString());
+            pendingPickFilePromises.pop().resolve(res);
+          }
         }
-      }
-    );
+      );
+    }
+    return pickFileLauncher;
   }
 
   @Override
   protected void finalize() throws Throwable {
-    pickFileLauncher.unregister();
+    if (pickFileLauncher != null) pickFileLauncher.unregister();
     super.finalize();
   }
 
@@ -533,7 +538,7 @@ public void pickFile(ReadableMap options, Promise promise) {
     // promises in FILO stack we should be able to resolve them in the correct
     // order.
     pendingPickFilePromises.push(promise);
-    pickFileLauncher.launch(mimeTypes);
+    getPickFileLauncher().launch(mimeTypes);
   }
 
   @ReactMethod

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:networkSecurityConfig="@xml/network_security_config"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">

diff --git a/example/android/app/src/main/res/xml/network_security_config.xml b/example/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">10.0.2.2</domain>
+    </domain-config>
+</network-security-config>