@react-native-documents/picker 10.1.5 → 10.1.7

package/android/src/main/java/com/reactnativedocumentpicker/MetadataGetter.kt

@@ -138,7 +138,7 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
   private fun <T> getCursorValue(cursor: Cursor, columnName: String, valueType: Class<T>): T? {
     val columnIndex = cursor.getColumnIndex(columnName)
     if (columnIndex != -1 && !cursor.isNull(columnIndex)) {
-      return try {
+      return runCatching {
         when (valueType) {
           String::class.java -> cursor.getString(columnIndex) as T
           Int::class.java -> cursor.getInt(columnIndex) as T
@@ -147,10 +147,8 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
           Float::class.java -> cursor.getFloat(columnIndex) as T
           else -> null
         }
-      } catch (e: Exception) {
-        // this should not happen but if it does, we return null
-        null
-      }
+      // throw should not happen but if it does, we return null
+      }.getOrNull()
     }
     return null
   }

package/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt

@@ -83,12 +83,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   override fun pick(opts: ReadableMap, promise: Promise) {
-    val currentActivity = currentActivity
+    val currentActivity = reactApplicationContext.currentActivity ?: return rejectWithNullActivity(promise)
 
-    if (currentActivity == null) {
-      rejectWithNullActivity(promise)
-      return
-    }
     if (!promiseWrapper.trySetPromiseRejectingIncoming(promise, "pick")) {
       return
     }
@@ -145,11 +141,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   override fun pickDirectory(opts: ReadableMap, promise: Promise) {
-    val currentActivity = currentActivity
-    if (currentActivity == null) {
-      rejectWithNullActivity(promise)
-      return
-    }
+    val currentActivity = reactApplicationContext.currentActivity ?: return rejectWithNullActivity(promise)
+
     if (!promiseWrapper.trySetPromiseRejectingIncoming(promise, "pickDirectory")) {
       return
     }

package/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.kt

@@ -0,0 +1,35 @@
+// LICENSE: see License.md in the package root
+package com.reactnativedocumentpicker
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNDocumentPickerPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == NativeDocumentPickerSpec.NAME) {
+      RNDocumentPickerModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+      val moduleInfos = mapOf(
+        NativeDocumentPickerSpec.NAME to ReactModuleInfo(
+          NativeDocumentPickerSpec.NAME,
+          NativeDocumentPickerSpec.NAME,  //          "DocumentPickerModule",
+          false,  // canOverrideExistingModule
+          false,  // needsEagerInit
+          false,  // isCxxModule
+          isTurboModule // isTurboModule
+        )
+      )
+      moduleInfos
+    }
+  }
+}

package/ios/RNDocumentPicker.mm

@@ -14,10 +14,6 @@
 #import "react_native_document_picker-Swift.h"
 #endif
 
-// for UIModalPresentationStyle conversion
-// remove after https://github.com/facebook/react-native/commit/2d547a3252b328251e49dabfeec85f8d46c85411 is released
-#import <React/RCTModalHostViewManager.h>
-
 @interface RNDocumentPicker ()
 @end
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-documents/picker",
-  "version": "10.1.5",
+  "version": "10.1.7",
   "description": "A react native interface to access documents from dropbox, google drive, iCloud...",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.java

@@ -1,49 +0,0 @@
-// LICENSE: see License.md in the package root
-package com.reactnativedocumentpicker;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RNDocumentPickerPackage extends TurboReactPackage {
-
-  @Nullable
-  @Override
-  public NativeModule getModule(String name, @NonNull ReactApplicationContext reactContext) {
-    if (name.equals(RNDocumentPickerModule.NAME)) {
-      return new RNDocumentPickerModule(reactContext);
-    } else {
-      return null;
-    }
-  }
-
-  @Override
-  public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    return () -> {
-      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-      moduleInfos.put(
-        RNDocumentPickerModule.NAME,
-        // deprecated in RN 0.73
-        new ReactModuleInfo(
-          RNDocumentPickerModule.NAME,
-          RNDocumentPickerModule.NAME,
-//          "DocumentPickerModule",
-          false, // canOverrideExistingModule
-          false, // needsEagerInit
-          false, // hasConstants
-          false, // isCxxModule
-          isTurboModule // isTurboModule
-        ));
-      return moduleInfos;
-    };
-  }
-}