rns-nativecall 0.0.4 → 0.0.6

package/android/src/main/java/com/rnsnativecall/CallModule.kt

@@ -22,20 +22,28 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
     override fun getName() = "CallModule"
 
+    private fun getPhoneAccountHandle(): PhoneAccountHandle {
+        val componentName = ComponentName(reactApplicationContext, MyConnectionService::class.java)
+        // Using the app's package name for the ID makes it unique for every app using this package
+        return PhoneAccountHandle(componentName, "${reactApplicationContext.packageName}.voip")
+    }
+
     private fun registerPhoneAccount() {
         val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-        val componentName = ComponentName(reactApplicationContext, MyConnectionService::class.java)
-        val phoneAccountHandle = PhoneAccountHandle(componentName, "RaiidrVoip")
+        val phoneAccountHandle = getPhoneAccountHandle()
 
-            // Combine all critical capabilities into one mask this is important!!!
-            val capabilities = PhoneAccount.CAPABILITY_VIDEO_CALLING or 
-                               PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING 
+        // Dynamically get the app's display name from the Android Manifest
+        val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
 
-            val phoneAccount = PhoneAccount.builder(phoneAccountHandle, "Raiidr") 
-                               .setCapabilities(capabilities) 
-                               .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED) 
-                               .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) 
-                               .build()
+        // Correct bitmasking: Combine all capabilities into a single integer
+        val capabilities = PhoneAccount.CAPABILITY_SELF_MANAGED or
+                           PhoneAccount.CAPABILITY_CALL_PROVIDER or
+                           PhoneAccount.CAPABILITY_VIDEO_CALLING or
+                           PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
+
+        val phoneAccount = PhoneAccount.builder(phoneAccountHandle, appName)
+            .setCapabilities(capabilities)
+            .build()
 
         telecomManager.registerPhoneAccount(phoneAccount)
     }
@@ -50,8 +58,7 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
         promise: Promise
     ) {
         val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-        val componentName = ComponentName(reactApplicationContext, MyConnectionService::class.java)
-        val phoneAccountHandle = PhoneAccountHandle(componentName, "RaiidrVoip")
+        val phoneAccountHandle = getPhoneAccountHandle()
 
         val extras = Bundle().apply {
             putParcelable(
@@ -85,13 +92,13 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     @ReactMethod
     fun checkTelecomPermissions(promise: Promise) {
         val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-        val componentName = ComponentName(reactApplicationContext, MyConnectionService::class.java)
-        val phoneAccountHandle = PhoneAccountHandle(componentName, "RaiidrVoip")
+        val phoneAccountHandle = getPhoneAccountHandle()
 
         val account = telecomManager.getPhoneAccount(phoneAccountHandle)
         if (account != null && account.isEnabled) {
             promise.resolve(true)
         } else {
+            // Opens the system settings for "Calling Accounts" so the user can enable the app
             val intent = Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             reactApplicationContext.startActivity(intent)
@@ -114,4 +121,4 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
                 ?.emit(eventName, params)
         }
     }
-}
+}

package/index.d.ts

@@ -1,4 +1,5 @@
 ///Users/bush/Desktop/Apps/Raiidr/package/index.d.ts
+
 export interface CallData {
     callUUID: string;
 }
@@ -7,14 +8,20 @@ export type CallAcceptedCallback = (data: CallData) => void;
 export type CallRejectedCallback = (data: CallData) => void;
 export type CallFailedCallback = (data: CallData) => void;
 
+/**
+ * Manually request/check Android permissions for Telecom.
+ * @returns Promise resolving to true if granted
+ */
+export function ensureAndroidPermissions(): Promise<boolean>;
+
 export interface CallHandlerType {
     /**
-     * Display an incoming call UI.
+     * Display an incoming call UI using ConnectionService (Android) or CallKit (iOS).
      * @param uuid Unique call identifier
-     * @param number Caller number
+     * @param number Caller number (or URI)
      * @param name Caller display name
-     * @param hasVideo True if video call
-     * @param shouldRing True to play native ringtone
+     * @param hasVideo True if video call (default: false)
+     * @param shouldRing True to play native ringtone (default: true)
      * @returns Promise resolving to true if successfully displayed
      */
     displayCall(
@@ -26,16 +33,16 @@ export interface CallHandlerType {
     ): Promise<boolean>;
 
     /**
-     * Dismiss native call UI
+     * Dismiss the native call UI (e.g., if the caller hangs up before the user answers).
      * @param uuid Call identifier
      */
     destroyNativeCallUI(uuid: string): void;
 
     /**
-     * Subscribe to call events
-     * @param onAccept Callback for accepted calls
-     * @param onReject Callback for rejected calls
-     * @param onFailed Optional callback for failed calls
+     * Subscribe to call events from the native side.
+     * @param onAccept Callback when user presses Answer
+     * @param onReject Callback when user presses Decline
+     * @param onFailed Optional callback for system-level failures
      * @returns Function to unsubscribe all listeners
      */
     subscribe(
@@ -47,4 +54,4 @@ export interface CallHandlerType {
 
 declare const CallHandler: CallHandlerType;
 
-export default CallHandler;
+export default CallHandler;

package/index.js

@@ -9,6 +9,15 @@ import {
 } from 'react-native';
 
 const { CallModule } = NativeModules;
+
+// Safety check for the Native Module
+if (!CallModule && __DEV__) {
+    console.warn(
+        "rns-nativecall: NativeModule.CallModule is undefined. " +
+        "Make sure you have rebuilt your native project (npx expo run:android / ios)."
+    );
+}
+
 const callEventEmitter = CallModule ? new NativeEventEmitter(CallModule) : null;
 
 const REQUIRED_PERMISSIONS = Platform.OS === 'android' ? [
@@ -19,84 +28,57 @@ const REQUIRED_PERMISSIONS = Platform.OS === 'android' ? [
 export async function ensureAndroidPermissions() {
     if (Platform.OS !== 'android') return true;
     const result = await PermissionsAndroid.requestMultiple(REQUIRED_PERMISSIONS);
-    const deniedPermissions = Object.entries(result)
-        .filter(([_, status]) => status !== PermissionsAndroid.RESULTS.GRANTED)
-        .map(([perm, _]) => perm);
-
-    if (deniedPermissions.length > 0) {
-        Alert.alert(
-            'Permissions Required',
-            `The following permissions are still missing: \n${deniedPermissions.join('\n')}`,
-            [{ text: 'Open Settings', onPress: () => Linking.openSettings() }]
-        );
-        return false;
-    }
-    return true;
+    return Object.values(result).every(status => status === PermissionsAndroid.RESULTS.GRANTED);
 }
 
 export const CallHandler = {
-
-    /**
-     * @param {string} uuid 
-     * @param {string} number 
-     * @param {string} name 
-     * @param {boolean} hasVideo 
-     * @param {boolean} shouldRing - NEW: Controls native ringtone/vibration
-     */
     displayCall: async (uuid, number, name, hasVideo = false, shouldRing = true) => {
-        if (!CallModule) {
-            console.log("CallModule is null. Check native linking.");
-            return false;
-        }
+        if (!CallModule) return false;
 
-        // 1. Android Specific Checks
         if (Platform.OS === 'android') {
             const hasPerms = await ensureAndroidPermissions();
             if (!hasPerms) return false;
 
+            // This triggers the "Calling Accounts" system settings if not enabled
             const isAccountEnabled = await CallModule.checkTelecomPermissions();
             if (!isAccountEnabled) return false;
         }
 
-        const cleanUuid = uuid.toLowerCase().trim();
-
-        // 2. Cross-platform execution
         try {
-            // We now pass 5 arguments to the native side
-            // uuid, number, name, hasVideo, shouldRing
-            const success = await CallModule.displayIncomingCall(
-                cleanUuid,
+            return await CallModule.displayIncomingCall(
+                uuid.toLowerCase().trim(),
                 number,
                 name,
                 hasVideo,
                 shouldRing
             );
-            return success;
         } catch (e) {
-            console.log("Native Call Error:", e);
+            console.error("Native Call Error:", e);
             return false;
         }
     },
 
     destroyNativeCallUI: (uuid) => {
-        if (CallModule && CallModule.endNativeCall) {
+        if (CallModule?.endNativeCall) {
             CallModule.endNativeCall(uuid.toLowerCase());
         }
     },
 
     subscribe: (onAccept, onReject, onFailed) => {
-        if (!callEventEmitter) {
-            return () => { };
-        }
+        if (!callEventEmitter) return () => { };
 
-        const acceptSub = callEventEmitter.addListener('onCallAccepted', (data) => onAccept(data));
-        const rejectSub = callEventEmitter.addListener('onCallRejected', (data) => onReject(data));
-        const failSub = onFailed ? callEventEmitter.addListener('onCallFailed', (data) => onFailed(data)) : null;
+        const subs = [
+            callEventEmitter.addListener('onCallAccepted', onAccept),
+            callEventEmitter.addListener('onCallRejected', onReject),
+        ];
 
-        return () => {
-            acceptSub.remove();
-            rejectSub.remove();
-            if (failSub) failSub.remove();
-        };
+        if (onFailed) {
+            subs.push(callEventEmitter.addListener('onCallFailed', onFailed));
+        }
+
+        return () => subs.forEach(s => s.remove());
     }
-};
+};
+
+// IMPORTANT: Exporting as default ensures "import CallHandler from '...'" works
+export default CallHandler;

package/ios/CallModule.m

@@ -11,20 +11,22 @@ RCT_EXPORT_MODULE();
 - (instancetype)init {
     self = [super init];
     if (self) {
+        // Dynamically get the App Name from the bundle so it's not hardcoded
+        NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
+        if (!appName) {
+            appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+        }
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:@"Raiidr"];
+        CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:appName];
 #pragma clang diagnostic pop
 
         config.supportsVideo = YES;
         config.maximumCallGroups = 1;
         config.maximumCallsPerCallGroup = 1;
         config.supportedHandleTypes = [NSSet setWithObject:@(CXHandleTypeGeneric)];
-        config.includesCallsInRecents = NO; // <-- prevent log
-
-        // If you had a custom file like "Ringtone.aif" in your project,
-        // you would set it here:
-        // config.ringtoneSound = @"Ringtone.aif";
+        config.includesCallsInRecents = NO;
 
         self.provider = [[CXProvider alloc] initWithConfiguration:config];
         [self.provider setDelegate:self queue:nil];
@@ -32,7 +34,7 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
-// Updated with showRing (BOOL)
+// Matches the 5 arguments in your JS/Android implementation
 RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
                   number:(NSString *)number
                   name:(NSString *)name
@@ -48,12 +50,12 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }
 
     CXCallUpdate *update = [[CXCallUpdate alloc] init];
+    // We use 'name' here so the system UI shows the caller's name instead of just their number
     update.remoteHandle = [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:name];
     update.hasVideo = hasVideo;
-    
-    // Note: CallKit handles ringing based on the CXProviderConfiguration.
-    // iOS doesn't allow toggling 'ring' per-call via reportNewIncomingCall.
-    // However, including it here ensures your JS bridge call matches.
+    update.supportsGrouping = NO;
+    update.supportsUngrouping = NO;
+    update.supportsHolding = NO;
 
     [self.provider reportNewIncomingCallWithUUID:uuid
                                           update:update
@@ -72,10 +74,15 @@ RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString) {
         [self.provider reportCallWithUUID:uuid
                               endedAtDate:[NSDate date]
                                    reason:CXCallEndedReasonRemoteEnded];
-
     }
 }
 
+// Placeholder for Android parity
+RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseResolveBlock)reject) {
+    resolve(@YES); // iOS permissions are handled via Info.plist and system prompts
+}
+
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
@@ -92,4 +99,4 @@ RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString) {
 
 - (void)providerDidReset:(CXProvider *)provider { }
 
-@end
+@end

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "rns-nativecall",
-    "version": "0.0.4",
-    "description": "Raiidr nativecall component with native Android/iOS for handling native call ui, when app is not open or open.",
+    "version": "0.0.6",
+    "description": "RNS nativecall component with native Android/iOS for handling native call ui, when app is not open or open.",
     "main": "index.js",
     "types": "index.d.ts",
     "homepage": "https://github.com/raiidr/rns-nativecall",

package/withRaiidrVoip.js

@@ -8,11 +8,10 @@ function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
         const manifest = config.modResults;
 
-        // 1. Add required permissions
         const permissions = [
             'android.permission.READ_PHONE_NUMBERS',
             'android.permission.CALL_PHONE',
-            'android.permission.MANAGE_OWN_CALLS' // Required for Self-Managed ConnectionService
+            'android.permission.MANAGE_OWN_CALLS'
         ];
 
         if (!manifest.manifest['uses-permission']) {
@@ -25,7 +24,6 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 2. Add MyConnectionService service
         const application = manifest.manifest.application[0];
         application.service = application.service || [];
 
@@ -69,15 +67,16 @@ function withIosConfig(config) {
             }
         });
 
-        // 2. Add descriptions for permissions
+        // 2. Dynamic Microphone Description
+        // config.name pulls the name from the user's app.json automatically
+        const appName = config.name || 'this app';
         infoPlist.NSMicrophoneUsageDescription =
-            infoPlist.NSMicrophoneUsageDescription || 'Allow Raiidr to access your microphone for calls.';
+            infoPlist.NSMicrophoneUsageDescription || `Allow ${appName} to access your microphone for calls.`;
 
         return config;
     });
 }
 
-// Export the combined plugin
 module.exports = (config) => {
     return withPlugins(config, [
         withAndroidConfig,