rns-nativecall 0.4.0 → 0.4.2

package/app.plugin.js

@@ -1,13 +1,6 @@
 ///app.plugin.js
-const { withPlugins } = require('@expo/config-plugins');
 const withNativeCallVoip = require('./withNativeCallVoip');
-const withCallNativeConfig = require('./withCallNativeConfig');
-const withCallPermissions = require('./withCallPermissions');
 
-module.exports = function (config, props) {
-    return withPlugins(config, [
-        [withNativeCallVoip, props],
-        [withCallNativeConfig, props],
-        [withCallPermissions, props],
-    ]);
+module.exports = function (config) {
+    return withNativeCallVoip(config);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "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",

package/withCallNativeConfig.js

@@ -1,3 +1,4 @@
+///withCallNativeConfig.js
 const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = require('@expo/config-plugins');
 
 /** 1. ANDROID MAIN ACTIVITY MODS **/

package/withCallPermissions.js

@@ -1,4 +1,5 @@
-const { withPlugins, withAndroidManifest } = require('@expo/config-plugins'); // Add this!
+//withCallPermissions.js
+const { withPlugins, withAndroidManifest } = require('@expo/config-plugins');
 
 
 /** 2. ANDROID MANIFEST MOD **/

package/withNativeCallVoip.js

@@ -1,140 +1,47 @@
 const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = require('@expo/config-plugins');
 
-/** 1. ANDROID MAIN ACTIVITY MOD **/
-// function withMainActivityDataFix(config) {
-//     return withMainActivity(config, (config) => {
-//         let contents = config.modResults.contents;
-
-//         // 1. Ensure necessary Imports are present
-//         if (!contents.includes('import android.content.Intent')) {
-//             contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
-//         }
-//         if (!contents.includes('import android.os.Bundle')) {
-//             contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.os.Bundle`);
-//         }
-
-//         // 2. Define the code blocks
-//         const onNewIntentCode = `
-//   override fun onNewIntent(intent: Intent) {
-//     super.onNewIntent(intent)
-//     setIntent(intent)
-//   }
-// `;
-
-//         const onCreateCode = `
-//   override fun onCreate(savedInstanceState: Bundle?) {
-//     super.onCreate(savedInstanceState)
-//     // If woken up silently, move to back to prevent UI flicker
-//     if (intent.getBooleanExtra("background_wake", false)) {
-//         moveTaskToBack(true)
-//     }
-//   }
-// `;
-
-//         // 3. Insert the codes before the last closing brace of the class
-//         if (!contents.includes('override fun onNewIntent')) {
-//             const lastBraceIndex = contents.lastIndexOf('}');
-//             contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
-//         }
-
-//         if (!contents.includes('override fun onCreate')) {
-//             // Re-calculate lastBraceIndex because contents string has changed
-//             const lastBraceIndex = contents.lastIndexOf('}');
-//             contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
-//         }
-
-//         config.modResults.contents = contents;
-//         return config;
-//     });
-// }
-
 /** 1. ANDROID MAIN ACTIVITY MOD **/
 function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // --- 1. Imports ---
-        const neededImports = [
+        // 1. Add required imports
+        const imports = [
             'import android.view.WindowManager',
             'import android.os.Build',
-            'import android.os.Bundle'
+            'import android.os.Bundle',
+            'import android.content.Intent'
         ];
-
-        neededImports.forEach(imp => {
+        imports.forEach(imp => {
             if (!contents.includes(imp)) {
                 contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
             }
         });
 
-        // --- 2. Replace onCreate ---
-        // We look for the existing onCreate and replace the entire block with your version
-        const editedOnCreate = `
-    // override fun onCreate(savedInstanceState: Bundle?) {
-    //     setTheme(R.style.AppTheme)
-    //     super.onCreate(savedInstanceState)
-
-    //     // --- LOCK SCREEN WAKE LOGIC ---
-    //     // This allows the Activity to appear over the lock screen when Answer is pressed
-    //     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-    //         setShowWhenLocked(true)
-    //         setTurnScreenOn(true)
-    //     } else {
-    //         @Suppress("DEPRECATION")
-    //         window.addFlags(
-    //             WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-    //             WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-    //             WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-    //         )
-    //     }
-    // }
-        override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
-        super.onCreate(savedInstanceState)
-
-        // Only wake the screen/bypass lock if we are coming from a notification interaction
-        // Otherwise, let the notification pill handle the UI.
-        if (intent?.action?.startsWith("ACTION_SHOW_UI") == true) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                setShowWhenLocked(true)
-                setTurnScreenOn(true)
-            } else {
-                @Suppress("DEPRECATION")
-                window.addFlags(
-                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                )
-            }
+        // 2. Add the Lockscreen / Wake logic inside onCreate
+        const wakeLogic = `super.onCreate(savedInstanceState)
+    if (intent?.getBooleanExtra("navigatingToCall", false) == true) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+        } else {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
         }
-    }
-    `;
-
-
-
+    }`;
 
-        // Regex to find the existing onCreate block (including the setTheme and super calls)
-        const onCreateRegex = /override fun onCreate\(savedInstanceState: Bundle\?\).*?\{[\s\S]*?super\.onCreate\(null\)\n\s*\}/;
-        if (contents.match(onCreateRegex)) {
-            contents = contents.replace(onCreateRegex, editedOnCreate);
+        if (!contents.includes('setShowWhenLocked')) {
+            contents = contents.replace(/super\.onCreate\(.*\)/, wakeLogic);
         }
 
-        // --- 3. Update createReactActivityDelegate ---
-        // Removing the "object :" and the empty trailing block "{})" to match your edited version
-        contents = contents.replace(
-            /return ReactActivityDelegateWrapper\([\s\S]*?object : (DefaultReactActivityDelegate\([\s\S]*?\))\{\}\)/,
-            'return ReactActivityDelegateWrapper($1)'
-        );
-
-        // --- 4. Ensure onNewIntent exists ---
-        const onNewIntentCode = `
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-    }`;
-
+        // 3. Ensure onNewIntent is present 
         if (!contents.includes('override fun onNewIntent')) {
+            const onNewIntentCode = `
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }\n`;
             const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + "\n" + contents.slice(lastBraceIndex);
+            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
         }
 
         config.modResults.contents = contents;
@@ -145,73 +52,83 @@ function withMainActivityDataFix(config) {
 /** 2. ANDROID MANIFEST CONFIG **/
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
-        const manifest = config.modResults;
-        const application = manifest.manifest.application[0];
+        const androidManifest = config.modResults.manifest;
+        const mainApplication = androidManifest.application[0];
+
+        // 1. Configure MainActivity flags in Manifest
+        const mainActivity = mainApplication.activity.find(a => a.$["android:name"] === ".MainActivity");
+        if (mainActivity) {
+            mainActivity.$["android:showWhenLocked"] = "true";
+            mainActivity.$["android:turnScreenOn"] = "true";
+        }
 
-        // 1. Unified Permissions
+        // 2. Unified Permissions
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
-            'android.permission.FOREGROUND_SERVICE_PHONE_CALL', // Required for Android 14
+            'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
             'android.permission.POST_NOTIFICATIONS',
             'android.permission.WAKE_LOCK',
             'android.permission.DISABLE_KEYGUARD',
-            'android.permission.RECEIVE_BOOT_COMPLETED' // Allows app to wake after phone restart
+            'android.permission.RECEIVE_BOOT_COMPLETED'
         ];
 
-        manifest.manifest['uses-permission'] = manifest.manifest['uses-permission'] || [];
+        androidManifest['uses-permission'] = androidManifest['uses-permission'] || [];
         permissions.forEach((perm) => {
-            if (!manifest.manifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
-                manifest.manifest['uses-permission'].push({ $: { 'android:name': perm } });
+            if (!androidManifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
+                androidManifest['uses-permission'].push({ $: { 'android:name': perm } });
             }
         });
 
-        // 2. Activity Setup (Remain unchanged as your logic was correct)
-        application.activity = application.activity || [];
-        // ... (Keep your AcceptCallActivity logic here)
-
-        // 3. Service Setup (CRITICAL UPDATES FOR ANDROID 14)
-        application.service = application.service || [];
-
-        // Add Firebase Messaging Service
-        const firebaseServiceName = 'com.rnsnativecall.CallMessagingService';
-        if (!application.service.some(s => s.$['android:name'] === firebaseServiceName)) {
-            application.service.push({
+        // 3. AcceptCallActivity Registration
+        mainApplication.activity = mainApplication.activity || [];
+        if (!mainApplication.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
+            mainApplication.activity.push({
                 $: {
-                    'android:name': firebaseServiceName,
+                    'android:name': 'com.rnsnativecall.AcceptCallActivity',
+                    'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
                     'android:exported': 'false',
-                    // Adding type for Android 14 stability
-                    'android:foregroundServiceType': 'phoneCall'
-                },
-                'intent-filter': [{ action: [{ $: { 'android:name': 'com.google.firebase.MESSAGING_EVENT' } }] }]
+                    'android:showWhenLocked': 'true',
+                    'android:turnScreenOn': 'true'
+                }
             });
         }
 
-        // Add Headless JS Task Service
-        const headlessServiceName = 'com.rnsnativecall.CallHeadlessTask';
-        if (!application.service.some(s => s.$['android:name'] === headlessServiceName)) {
-            application.service.push({
-                $: {
-                    'android:name': headlessServiceName,
-                    'android:exported': 'false',
-                    // This ensures the JS bridge is treated as a priority process
-                    'android:foregroundServiceType': 'phoneCall'
+        // 4. Service Setup
+        mainApplication.service = mainApplication.service || [];
+
+        const services = [
+            {
+                name: 'com.rnsnativecall.CallMessagingService',
+                intentFilter: 'com.google.firebase.MESSAGING_EVENT'
+            },
+            {
+                name: 'com.rnsnativecall.CallHeadlessTask'
+            }
+        ];
+
+        services.forEach(svc => {
+            if (!mainApplication.service.some(s => s.$['android:name'] === svc.name)) {
+                const serviceEntry = {
+                    $: {
+                        'android:name': svc.name,
+                        'android:exported': 'false',
+                        'android:foregroundServiceType': 'phoneCall'
+                    }
+                };
+                if (svc.intentFilter) {
+                    serviceEntry['intent-filter'] = [{ action: [{ $: { 'android:name': svc.intentFilter } }] }];
                 }
-            });
-        }
+                mainApplication.service.push(serviceEntry);
+            }
+        });
 
-        // 4. Receiver Setup
-        application.receiver = application.receiver || [];
-        const receiverName = 'com.rnsnativecall.CallActionReceiver';
-        if (!application.receiver.some(r => r.$['android:name'] === receiverName)) {
-            application.receiver.push({
-                $: { 'android:name': receiverName, 'android:exported': 'false' },
-                'intent-filter': [{
-                    action: [
-                        { $: { 'android:name': 'android.intent.action.BOOT_COMPLETED' } }
-                    ]
-                }]
+        // 5. Receiver Setup
+        mainApplication.receiver = mainApplication.receiver || [];
+        if (!mainApplication.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
+            mainApplication.receiver.push({
+                $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' }
             });
         }