rns-nativecall 1.3.2 → 1.3.3

package/README.md

@@ -297,4 +297,4 @@ MIT License
 
 ---
 
-Built for **production VoIP apps**, not demos.
+Built for **production VoIP apps**, not demos.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",
@@ -48,8 +48,6 @@
         "react-native": ">=0.60.0"
     },
     "dependencies": {
-        "@expo/config-plugins": "^9.0.0",
-        "react-native-uuid": "^2.0.3",
-        "expo-build-properties": "~0.14.8"
+        "@expo/config-plugins": "^9.0.0"
     }
 }

package/withNativeCallVoip.js

@@ -13,7 +13,6 @@ function withMainActivityDataFix(config) {
             'import android.Manifest'
         ];
 
-        // Add imports if they don't exist
         imports.forEach(imp => {
             if (!contents.includes(imp)) {
                 contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
@@ -21,16 +20,21 @@ function withMainActivityDataFix(config) {
         });
 
         const onCreateCode = `
-  override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     
-    // Request Notification Permissions for Android 13+ (Required for Pill UI)
+    // Request Permissions for Android 13+ and Calling Roles
+    val permissions = mutableListOf<String>()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        ActivityCompat.requestPermissions(
-            this,
-            arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-            101
-        )
+        permissions.add(Manifest.permission.POST_NOTIFICATIONS)
+    }
+    // MANAGE_OWN_CALLS is required for Foreground Service Type 'phoneCall' on SDK 34+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        permissions.add(Manifest.permission.MANAGE_OWN_CALLS)
+    }
+
+    if (permissions.isNotEmpty()) {
+        ActivityCompat.requestPermissions(this, permissions.toTypedArray(), 101)
     }
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
@@ -69,35 +73,45 @@ function withMainActivityDataFix(config) {
         return config;
     });
 }
+
 function withNotificationColor(config) {
     // 1. Find the color in app.json (fallback to #218aff)
     const notificationPlugin = config.plugins?.find(p => Array.isArray(p) && p[0] === 'expo-notifications');
     const iconColor = notificationPlugin?.[1]?.color || '#218aff';
 
     return withAndroidStyles(config, (config) => {
+        // Corrected from config.config.modResults to config.modResults
         config.modResults = AndroidConfig.Styles.assignStylesValue(config.modResults, {
             name: 'notification_icon_color',
             value: iconColor,
-            parent: 'AppTheme', // or your primary theme
+            parent: 'AppTheme',
             type: 'color',
         });
         return config;
     });
 }
-/** 2. ANDROID MANIFEST CONFIG **/
+
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
         const manifest = config.modResults;
+
+        // Ensure manifest structure exists
+        if (!manifest.manifest) manifest.manifest = {};
+        if (!manifest.manifest.application) manifest.manifest.application = [{}];
+
         const application = manifest.manifest.application[0];
 
-        // Ensure MainActivity flags
-        const mainActivity = application.activity.find((a) => a.$['android:name'] === '.MainActivity');
-        if (mainActivity) {
-            mainActivity.$['android:launchMode'] = 'singleTop';
-            mainActivity.$['android:showWhenLocked'] = 'true';
-            mainActivity.$['android:turnScreenOn'] = 'true';
+        // 1. Ensure MainActivity flags
+        if (application.activity) {
+            const mainActivity = application.activity.find((a) => a.$['android:name'] === '.MainActivity');
+            if (mainActivity) {
+                mainActivity.$['android:launchMode'] = 'singleTop';
+                mainActivity.$['android:showWhenLocked'] = 'true';
+                mainActivity.$['android:turnScreenOn'] = 'true';
+            }
         }
 
+        // 2. Fix Permissions (The 'some' error fix)
         const permissions = [
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
@@ -110,16 +124,21 @@ function withAndroidConfig(config) {
             'android.permission.MANAGE_OWN_CALLS',
         ];
 
-        manifest.manifest['uses-permission'] = manifest.manifest['uses-permission'] || [];
+        // Initialize uses-permission if it doesn't exist
+        if (!Array.isArray(manifest.manifest['uses-permission'])) {
+            manifest.manifest['uses-permission'] = [];
+        }
+
         permissions.forEach((perm) => {
-            if (!manifest.manifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
+            if (!manifest.manifest['uses-permission'].some((p) => p.$ && p.$['android:name'] === perm)) {
                 manifest.manifest['uses-permission'].push({ $: { 'android:name': perm } });
             }
         });
 
-        application.service = application.service || [];
-        application.activity = application.activity || [];
-        application.receiver = application.receiver || [];
+        // 3. Fix Services
+        if (!Array.isArray(application.service)) {
+            application.service = [];
+        }
 
         const services = [
             { name: 'com.rnsnativecall.CallMessagingService', exported: 'false', filter: 'com.google.firebase.MESSAGING_EVENT' },
@@ -129,7 +148,7 @@ function withAndroidConfig(config) {
         ];
 
         services.forEach(svc => {
-            if (!application.service.some(s => s.$['android:name'] === svc.name)) {
+            if (!application.service.some(s => s.$ && s.$['android:name'] === svc.name)) {
                 const entry = { $: { 'android:name': svc.name, 'android:exported': svc.exported || 'false' } };
                 if (svc.type) entry.$['android:foregroundServiceType'] = svc.type;
                 if (svc.filter) {
@@ -139,13 +158,18 @@ function withAndroidConfig(config) {
             }
         });
 
+        // 4. Fix Activities
+        if (!Array.isArray(application.activity)) {
+            application.activity = [];
+        }
+
         const activities = [
             { name: 'com.rnsnativecall.AcceptCallActivity', theme: '@android:style/Theme.Translucent.NoTitleBar', launchMode: 'singleInstance' },
             { name: 'com.rnsnativecall.NotificationOverlayActivity', theme: '@android:style/Theme.NoTitleBar.Fullscreen', launchMode: 'singleInstance' }
         ];
 
         activities.forEach(act => {
-            if (!application.activity.some(a => a.$['android:name'] === act.name)) {
+            if (!application.activity.some(a => a.$ && a.$['android:name'] === act.name)) {
                 application.activity.push({
                     $: {
                         'android:name': act.name,
@@ -161,28 +185,28 @@ function withAndroidConfig(config) {
             }
         });
 
-        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
+        // 5. Fix Receiver (The other likely 'some' error source)
+        if (!Array.isArray(application.receiver)) {
+            application.receiver = [];
+        }
+
+        if (!application.receiver.some(r => r.$ && r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
             application.receiver.push({ $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' } });
         }
 
         return config;
     });
 }
-/** 2. IOS APP DELEGATE MOD (The fix for Lock Screen Answer) **/
+
 function withIosAppDelegateMod(config) {
     return withAppDelegate(config, (config) => {
         let contents = config.modResults.contents;
-
-        // 1. Surgical Import: Add 'import React' at the very top if missing
         if (!contents.includes('import React')) {
             contents = 'import React\n' + contents;
         }
 
-        // 2. Check for the continue userActivity method
         if (!contents.includes('continue userActivity')) {
-            // Method is missing, inject it before the final closing brace of the class
             const swiftLinkingCode = `
-  // Universal Links
   public override func application(
     _ application: UIApplication,
     continue userActivity: NSUserActivity,
@@ -192,36 +216,26 @@ function withIosAppDelegateMod(config) {
     return super.application(application, continue: userActivity, restorationHandler: restorationHandler) || result
   }
 `;
-            // This regex finds the last '}' in the file (closing the AppDelegate class)
             contents = contents.replace(/\n}\s*$/, `\n${swiftLinkingCode}\n}`);
-        } else if (!contents.includes('RCTLinkingManager.application')) {
-            // Method exists but is missing our logic, inject it inside
-            contents = contents.replace(
-                /continue userActivity: NSUserActivity,[\s\S]*?\) -> Bool \{/,
-                `continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {\n    let result = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)`
-            );
         }
-
         config.modResults.contents = contents;
         return config;
     });
 }
-/** 3. IOS INFO.PLIST CONFIG (Existing) **/
+
 function withIosConfig(config, props = {}) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;
         if (!infoPlist.UIBackgroundModes) infoPlist.UIBackgroundModes = [];
-
         ['voip', 'remote-notification'].forEach(mode => {
             if (!infoPlist.UIBackgroundModes.includes(mode)) {
                 infoPlist.UIBackgroundModes.push(mode);
             }
         });
-
         return config;
     });
 }
-// Main Plugin Entry
+
 module.exports = (config, props) => {
     return withPlugins(config, [
         withAndroidConfig,