fix: make both platforms work on both archs

Author: WoLewicki

FabricExample/.watchmanconfig

@@ -1 +1 @@
-{}
+{}

FabricExample/app.json

@@ -1,4 +1,4 @@
 {
   "name": "FabricExample",
   "displayName": "FabricExample"
-}
+}

FabricExample/metro.config.js

@@ -7,9 +7,7 @@ const pack = require('../package.json');
 
 const root = path.resolve(__dirname, '..');
 
-const modules = [
-  ...Object.keys(pack.peerDependencies),
-];
+const modules = [...Object.keys(pack.peerDependencies)];
 
 module.exports = {
   projectRoot: __dirname,
@@ -20,8 +18,7 @@ module.exports = {
   resolver: {
     blacklistRE: exclusionList(
       modules.map(
-        (m) =>
-          new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`),
+        m => new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`),
       ),
     ),
 
@@ -39,4 +36,4 @@ module.exports = {
       },
     }),
   },
-};
+};

android/src/main/java/com/zoontek/rnpermissions/RNPermissionsModule.java

@@ -18,7 +18,6 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
@@ -28,6 +27,7 @@
 import com.facebook.react.modules.core.PermissionListener;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 
 @ReactModule(name = RNPermissionsModule.NAME)
@@ -376,11 +376,11 @@ public void invoke(Object... args) {
 
   @Override
   protected Map<String, Object> getTypedExportedConstants() {
-    return null;
+    return new HashMap<>();
   }
 
   @Override
-  public void check(double permission, Promise promise) {
+  public void check(String permission, Promise promise) {
     promise.reject("Permissions:check", "check is not supported on Android");
   }
 
@@ -390,7 +390,7 @@ public void checkLocationAccuracy(Promise promise) {
   }
 
   @Override
-  public void request(double permission, Promise promise) {
+  public void request(String permission, Promise promise) {
     promise.reject("Permissions:request", "request is not supported on Android");
   }
 

android/src/paper/java/com/zoontek/rnpermissions/NativePermissionsModuleSpec.java

@@ -62,15 +62,15 @@ public NativePermissionsModuleSpec(ReactApplicationContext reactContext) {
 
   @ReactMethod
   @DoNotStrip
-  public abstract void check(double permission, Promise promise);
+  public abstract void check(String permission, Promise promise);
 
   @ReactMethod
   @DoNotStrip
   public abstract void checkLocationAccuracy(Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void request(double permission, Promise promise);
+  public abstract void request(String permission, Promise promise);
 
   @ReactMethod
   @DoNotStrip
@@ -91,10 +91,10 @@ public NativePermissionsModuleSpec(ReactApplicationContext reactContext) {
   public final @Nullable Map<String, Object> getConstants() {
     Map<String, Object> constants = getTypedExportedConstants();
     if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
-      Set<String> obligatoryFlowConstants = new HashSet<>(Arrays.asList(
+      Set<String> obligatoryFlowConstants = new HashSet<>();
+      Set<String> optionalFlowConstants = new HashSet<>(Arrays.asList(
           "available"
       ));
-      Set<String> optionalFlowConstants = new HashSet<>();
       Set<String> undeclaredConstants = new HashSet<>(constants.keySet());
       undeclaredConstants.removeAll(obligatoryFlowConstants);
       undeclaredConstants.removeAll(optionalFlowConstants);

ios/RNPermissionsModule.h

@@ -1,5 +1,5 @@
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <rnpermissions/rnpermissions.h>
+#import <rnpermission/rnpermission.h>
 #else
 #import <React/RCTBridge.h>
 #endif

ios/RNPermissionsModule.mm

@@ -367,10 +367,22 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
   }];
 }
 
-RCT_EXPORT_METHOD(check:(NSString *)permission
+RCT_EXPORT_METHOD(check:
+#ifdef RCT_NEW_ARCH_ENABLED
+                  (NSString *)
+#else
+                  (RNPermission)
+#endif
+                 permission
                  resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
-  id<RNPermissionHandler> handler = [self handlerForPermission:permission];
+  id<RNPermissionHandler> handler = [self handlerForPermission:
+#ifdef RCT_NEW_ARCH_ENABLED
+                                     [RCTConvert RNPermission:permission]
+#else
+                                     permission
+#endif
+                                     ];
   NSString *lockId = [self lockHandler:handler];
 
   [handler checkWithResolver:^(RNPermissionStatus status) {
@@ -382,10 +394,22 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
   }];
 }
 
-RCT_EXPORT_METHOD(request:(NSString *)permission
+RCT_EXPORT_METHOD(request:
+#ifdef RCT_NEW_ARCH_ENABLED
+                  (NSString *)
+#else
+                  (RNPermission)
+#endif
+                 permission
                  resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
-  id<RNPermissionHandler> handler = [self handlerForPermission:permission];
+    id<RNPermissionHandler> handler = [self handlerForPermission:
+  #ifdef RCT_NEW_ARCH_ENABLED
+                                       [RCTConvert RNPermission:permission]
+  #else
+                                       permission
+  #endif
+                                       ];
   NSString *lockId = [self lockHandler:handler];
 
   [handler requestWithResolver:^(RNPermissionStatus status) {
@@ -489,12 +513,13 @@ - (void)shouldShowRequestPermissionRationale:(NSString *)permission resolve:(RCT
     reject(@"RNPermissions:shouldShowRequestPermissionRationale", @"shouldShowRequestPermissionRationale is not supported on iOS", nil);
 }
 
-- (facebook::react::ModuleConstants<JS::NativePermissionsModule::Constants::Builder>)getConstants { 
+
+#if RCT_NEW_ARCH_ENABLED
+
+- (facebook::react::ModuleConstants<JS::NativePermissionsModule::Constants::Builder>)getConstants {
     return [self constantsToExport];
 }
 
-
-#if RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {

package.json

@@ -76,7 +76,7 @@
     "typescript": "^4.7.4"
   },
   "codegenConfig": {
-    "name": "rnpermissions",
+    "name": "rnpermission",
     "type": "modules",
     "jsSrcsDir": "./src",
     "android": {

src/NativePermissionsModule.ts

@@ -1,34 +1,32 @@
 /* eslint-disable @typescript-eslint/ban-types */
 // we use Object type because methods on the native side use NSDictionary and ReadableMap
 // and we want to stay compatible with those
-import {TurboModuleRegistry, TurboModule} from 'react-native';
+import {TurboModule, TurboModuleRegistry} from 'react-native';
 
 type NotificationsResponse = {
-    status: Object;
-    settings: Object;
-  };
+  status: Object;
+  settings: Object;
+};
 
 export interface Spec extends TurboModule {
-    openSettings(): Promise<void>;
-    checkNotifications(): Promise<NotificationsResponse>;
+  openSettings(): Promise<void>;
+  checkNotifications(): Promise<NotificationsResponse>;
 
-    // Android only part
-    checkPermission(permission: string): Promise<string>;
-    shouldShowRequestPermissionRationale(permission: string): Promise<boolean>;
-    requestPermission(permission: string): Promise<string>;
-    checkMultiplePermissions(permissions: string[]): Promise<Object>;
-    requestMultiplePermissions(permissions: string[]): Promise<Object>;
+  // Android only part
+  checkPermission(permission: string): Promise<string>;
+  shouldShowRequestPermissionRationale(permission: string): Promise<boolean>;
+  requestPermission(permission: string): Promise<string>;
+  checkMultiplePermissions(permissions: string[]): Promise<Object>;
+  requestMultiplePermissions(permissions: string[]): Promise<Object>;
 
-    // iOS only part
-    check(permission: string): Promise<string>; // TODO: should be number prolly
-    checkLocationAccuracy(): Promise<string>;
-    request(permission: string): Promise<string>; // TODO: should be number prolly
-    requestLocationAccuracy(purposeKey: string): Promise<string>;
-    requestNotifications(options: string[]): Promise<NotificationsResponse>;
-    openLimitedPhotoLibraryPicker(): Promise<boolean>;
-    getConstants(): {
-        available: string[];
-    };
+  // iOS only part
+  check(permission: string): Promise<string>; // TODO: should be number prolly
+  checkLocationAccuracy(): Promise<string>;
+  request(permission: string): Promise<string>; // TODO: should be number prolly
+  requestLocationAccuracy(purposeKey: string): Promise<string>;
+  requestNotifications(options: string[]): Promise<NotificationsResponse>;
+  openLimitedPhotoLibraryPicker(): Promise<boolean>;
+  getConstants(): {available?: string[]};
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('RNPermissionsModule');
+export default TurboModuleRegistry.getEnforcing<Spec>('RNPermissionsModule');

src/methods.android.ts

@@ -1,21 +1,21 @@
 import {Alert, AlertButton} from 'react-native';
 import type {Contract} from './contract';
+import NativeModule from './NativePermissionsModule';
 import type {NotificationsResponse, Permission, PermissionStatus, Rationale} from './types';
 import {
   checkLocationAccuracy,
   openLimitedPhotoLibraryPicker,
   requestLocationAccuracy,
 } from './unsupportedPlatformMethods';
 import {platformVersion, uniq} from './utils';
-import NativeModule from './NativePermissionsModule';
 const TIRAMISU_VERSION_CODE = 33;
 
 async function openSettings(): Promise<void> {
   await NativeModule.openSettings();
 }
 
 function check(permission: Permission): Promise<PermissionStatus> {
-  return NativeModule.checkPermission(permission);
+  return NativeModule.checkPermission(permission) as Promise<PermissionStatus>;
 }
 
 async function request(permission: Permission, rationale?: Rationale): Promise<PermissionStatus> {
@@ -29,27 +29,29 @@ async function request(permission: Permission, rationale?: Rationale): Promise<P
         const buttons: AlertButton[] = [];
 
         if (buttonNegative) {
-          const onPress = () => resolve(NativeModule.checkPermission(permission));
+          const onPress = () =>
+            resolve(NativeModule.checkPermission(permission) as Promise<PermissionStatus>);
           buttonNeutral && buttons.push({text: buttonNeutral, onPress});
           buttons.push({text: buttonNegative, onPress});
         }
 
         buttons.push({
           text: buttonPositive,
-          onPress: () => resolve(NativeModule.requestPermission(permission)),
+          onPress: () =>
+            resolve(NativeModule.requestPermission(permission) as Promise<PermissionStatus>),
         });
 
         Alert.alert(title, message, buttons, {cancelable: false});
       });
     }
   }
 
-  return NativeModule.requestPermission(permission);
+  return NativeModule.requestPermission(permission) as Promise<PermissionStatus>;
 }
 
 async function checkNotifications(): Promise<NotificationsResponse> {
   if (platformVersion < TIRAMISU_VERSION_CODE) {
-    return NativeModule.checkNotifications();
+    return NativeModule.checkNotifications() as Promise<NotificationsResponse>;
   }
 
   const status = await check('android.permission.POST_NOTIFICATIONS');
@@ -58,7 +60,7 @@ async function checkNotifications(): Promise<NotificationsResponse> {
 
 async function requestNotifications(): Promise<NotificationsResponse> {
   if (platformVersion < TIRAMISU_VERSION_CODE) {
-    return NativeModule.checkNotifications();
+    return NativeModule.checkNotifications() as Promise<NotificationsResponse>;
   }
 
   const status = await request('android.permission.POST_NOTIFICATIONS');
@@ -69,14 +71,18 @@ function checkMultiple<P extends Permission[]>(
   permissions: P,
 ): Promise<Record<P[number], PermissionStatus>> {
   const dedup = uniq(permissions);
-  return NativeModule.checkMultiplePermissions(dedup);
+  return NativeModule.checkMultiplePermissions(dedup) as Promise<
+    Record<P[number], PermissionStatus>
+  >;
 }
 
 function requestMultiple<P extends Permission[]>(
   permissions: P,
 ): Promise<Record<P[number], PermissionStatus>> {
   const dedup = uniq(permissions);
-  return NativeModule.requestMultiplePermissions(dedup);
+  return NativeModule.requestMultiplePermissions(dedup) as Promise<
+    Record<P[number], PermissionStatus>
+  >;
 }
 
 export const methods: Contract = {