rns-nativecall 0.6.5 → 0.6.6

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

@@ -13,6 +13,7 @@ class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // Ensure we show over the lockscreen
         window.addFlags(
             WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
             WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
@@ -34,36 +35,30 @@ class AcceptCallActivity : Activity() {
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         uuid?.let { notificationManager.cancel(it.hashCode()) }
 
-        // ✅ WE STOP SENDING THE JS EVENT HERE.
-        // Instead, we pass the intent to MainActivity with a specific ACTION.
+        val dataMap = mutableMapOf<String, String>()
+        extras?.keySet()?.forEach { key ->
+            extras.get(key)?.let { dataMap[key] = it.toString() }
+        }
+
+        // 1. Set the data for JS (Cold start support)
+        CallModule.setPendingCallData("onCallAccepted_pending", dataMap)
+        
+        // 2. Fire event immediately if JS is alive
+        if (CallModule.isReady()) {
+            CallModule.sendEventToJS("onCallAccepted", dataMap)
+        }
+
+        // 3. Bring the Main App to the front
         openMainApp(extras)
         finish()
     }
 
     private fun openMainApp(extras: Bundle?) {
-        try {
-            // Get the actual MainActivity class name (e.g., com.yourapp.MainActivity)
-            val mainActivityClassName = "${packageName}.MainActivity"
-            
-            val intent = Intent().apply {
-                setClassName(packageName, mainActivityClassName)
-                action = "com.rnsnativecall.ACTION_ANSWER"
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                
-                // Ensure extras are carried over
-                extras?.let { putExtras(it) }
-            }
-            
-            startActivity(intent)
-        } catch (e: Exception) {
-            // Fallback: If explicit mapping fails, try the launch intent but force the action
-            val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
-            launchIntent?.apply {
-                action = "com.rnsnativecall.ACTION_ANSWER"
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                extras?.let { putExtras(it) }
-                startActivity(this)
-            }
+        val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+        launchIntent?.apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            putExtras(extras ?: Bundle())
+            startActivity(this)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.6.5",
+    "version": "0.6.6",
     "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",

package/withNativeCallVoip.js

@@ -5,32 +5,10 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // Ensure imports exist
-        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`);
-        }
-
         const onNewIntentCode = `
   override fun onNewIntent(intent: Intent) {
     super.onNewIntent(intent)
     setIntent(intent)
-    
-    // Check for the specific Answer Action
-    val isAnswerAction = intent.action == "com.rnsnativecall.ACTION_ANSWER"
-    
-    val dataMap = mutableMapOf<String, String>()
-    intent.extras?.keySet()?.forEach { key ->
-        dataMap[key] = intent.extras?.get(key)?.toString() ?: ""
-    }
-
-    // FIRE if it's the answer action, even if extras are slim
-    if (isAnswerAction) {
-        com.rnsnativecall.CallModule.setPendingCallData("onCallAccepted_pending", dataMap)
-        com.rnsnativecall.CallModule.sendEventToJS("onCallAccepted", dataMap)
-    }
   }
 `;
 
@@ -38,25 +16,12 @@ function withMainActivityDataFix(config) {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     
-    val isAnswerAction = intent.action == "com.rnsnativecall.ACTION_ANSWER"
-    
-    // Logic for Cold Start (App was dead, user answered)
-    if (isAnswerAction) {
-        val dataMap = mutableMapOf<String, String>()
-        intent.extras?.keySet()?.forEach { key ->
-            dataMap[key] = intent.extras?.get(key)?.toString() ?: ""
-        }
-        com.rnsnativecall.CallModule.setPendingCallData(dataMap)
-    }
-
-    // Move to back if it's a background wake (FCM) and NOT an answer click
-    if (intent.getBooleanExtra("background_wake", false) && !isAnswerAction) {
+    // If background wake from FCM, move to back to let LockScreen UI show
+    if (intent.getBooleanExtra("background_wake", false)) {
         moveTaskToBack(true)
     }
   }
 `;
-
-        // Inject codes
         if (!contents.includes('override fun onNewIntent')) {
             const lastBraceIndex = contents.lastIndexOf('}');
             contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);