rns-nativecall 0.6.3 → 0.6.5

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

@@ -13,70 +13,57 @@ class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // Wake + lock flags
         window.addFlags(
             WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
             WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
-            WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
         )
 
-        // Optionally dismiss keyguard
         val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         keyguardManager.requestDismissKeyguard(this, null)
 
         processCallIntent(intent)
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        processCallIntent(intent)
-    }
-
     private fun processCallIntent(intent: Intent) {
         NativeCallManager.stopRingtone()
 
         val extras = intent.extras
         val uuid = extras?.getString("callUuid")
-        val name = extras?.getString("name") ?: "Someone"
-        val callType = extras?.getString("callType") ?: "audio"
 
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         uuid?.let { notificationManager.cancel(it.hashCode()) }
 
-        val dataMap = mutableMapOf<String, String>()
-        extras?.keySet()?.forEach { key ->
-            extras.get(key)?.let { dataMap[key] = it.toString() }
-        }
-
-        if (CallModule.isReady()) {
-            CallModule.sendEventToJS("onCallAccepted", dataMap)
-            openMainApp(extras)
-            finish()
-        } else {
-            CallModule.setPendingCallData("onCallAccepted_pending", dataMap)
-            if (uuid != null) {
-                NativeCallManager.connecting(this, uuid, name, callType)
-            }
-            // Register callback to auto‑open app once RN is ready
-            CallModule.registerOnReadyCallback {
-                runOnUiThread {
-                    openMainApp(extras)
-                    finish()
-                }
-            }
-        }
+        // ✅ WE STOP SENDING THE JS EVENT HERE.
+        // Instead, we pass the intent to MainActivity with a specific ACTION.
+        openMainApp(extras)
+        finish()
     }
 
-    // ✅ Now a proper member function
     private fun openMainApp(extras: Bundle?) {
-        val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
-        launchIntent?.apply {
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-            putExtras(extras ?: Bundle())
-            putExtra("navigatingToCall", true)
-            startActivity(this)
+        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)
+            }
         }
     }
-}
+}

package/package.json

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

@@ -4,34 +4,59 @@ const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = re
 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() ?: ""
     }
-    if (dataMap.isNotEmpty()) {
-        com.rnsnativecall.CallModule.setPendingCallData(dataMap)
+
+    // 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)
     }
   }
 `;
+
         const onCreateCode = `
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    if (intent.getBooleanExtra("background_wake", false)) {
+    
+    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) {
         moveTaskToBack(true)
     }
   }
 `;
+
+        // Inject codes
         if (!contents.includes('override fun onNewIntent')) {
             const lastBraceIndex = contents.lastIndexOf('}');
             contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
@@ -40,6 +65,7 @@ function withMainActivityDataFix(config) {
             const lastBraceIndex = contents.lastIndexOf('}');
             contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
         }
+
         config.modResults.contents = contents;
         return config;
     });