rns-nativecall 0.4.7 → 0.4.8

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

@@ -1,9 +1,12 @@
+package com.rnsnativecall
+
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
+import android.content.Intent // CRITICAL IMPORT
 import android.os.Build
+import android.os.Bundle // CRITICAL IMPORT
 import androidx.core.app.NotificationCompat
 import android.media.Ringtone
 import android.media.RingtoneManager
@@ -23,14 +26,13 @@ object NativeCallManager {
         val name = data["name"] ?: "Someone"
         val callType = data["callType"] ?: "audio"
 
-        // Use FLAG_IMMUTABLE for security unless you need to modify the intent in the system
         val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
         } else {
             PendingIntent.FLAG_UPDATE_CURRENT
         }
 
-        // 1. Full Screen Intent (Opens the UI when phone is locked or heads-up is clicked)
+        // 1. Full Screen / UI Intent
         val intentToActivity = Intent(context, AcceptCallActivity::class.java).apply {
             action = "ACTION_SHOW_UI_$uuid"
             data.forEach { (key, value) -> putExtra(key, value) }
@@ -40,7 +42,7 @@ object NativeCallManager {
             context, uuid.hashCode(), intentToActivity, pendingFlags
         )
 
-        // 2. Reject Intent (Broadcast)
+        // 2. Reject Intent
         val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
             action = "ACTION_REJECT_$uuid"
             putExtra("EXTRA_CALL_UUID", uuid)
@@ -50,9 +52,9 @@ object NativeCallManager {
             context, uuid.hashCode() + 1, rejectIntent, pendingFlags
         )
 
-        // 3. Answer Intent (Broadcast - Process the logic before opening UI)
+        // 3. Answer Intent (Using your CallActionReceiver)
         val answerIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_ANSWER_$uuid"
+            action = "ACTION_ACCEPT_$uuid" // Changed to match your Receiver logic
             putExtra("EXTRA_CALL_UUID", uuid)
             data.forEach { (key, value) -> putExtra(key, value) }
         }
@@ -62,35 +64,28 @@ object NativeCallManager {
 
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        // Create Channel for Android O+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                CALL_CHANNEL_ID, 
-                "Incoming Call", 
-                NotificationManager.IMPORTANCE_HIGH
-            ).apply {
+            val channel = NotificationChannel(CALL_CHANNEL_ID, "Incoming Call", NotificationManager.IMPORTANCE_HIGH).apply {
                 setBypassDnd(true)
                 lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
-                enableVibration(true) 
-                setSound(null, null) // Sound is handled manually via RingtoneManager
+                enableVibration(true)
+                setSound(null, null) 
             }
             notificationManager.createNotificationChannel(channel)
         }
 
-        // 4. Build the "Person" (Required for CallStyle)
         val caller = Person.Builder()
             .setName(name)
             .setImportant(true)
             .build()
 
-        // 5. Create the Notification with CallStyle
         val builder = NotificationCompat.Builder(context, CALL_CHANNEL_ID)
-            .setSmallIcon(context.applicationInfo.icon) // Ensure this is a silhouette icon
+            .setSmallIcon(context.applicationInfo.icon)
             .setContentTitle("Incoming $callType call")
             .setContentText(name)
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setOngoing(true)
+            .setOngoing(true) 
             .setAutoCancel(false)
             .setFullScreenIntent(fullScreenPendingIntent, true)
             .setColor(Color.parseColor("#28a745"))
@@ -102,26 +97,21 @@ object NativeCallManager {
                     answerPendingIntent
                 )
             )
-
+   
         notificationManager.notify(uuid.hashCode(), builder.build())
 
-        // Start Ringtone
         try {
             val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
             ringtone = RingtoneManager.getRingtone(context, ringtoneUri)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) ringtone?.isLooping = true
             ringtone?.play()
-        } catch (e: Exception) { 
-            e.printStackTrace() 
-        }
+        } catch (e: Exception) { e.printStackTrace() }
     }
 
     fun stopRingtone() {
         try {
             ringtone?.let {
-                if (it.isPlaying) {
-                    it.stop()
-                }
+                if (it.isPlaying) it.stop()
             }
             ringtone = null
         } catch (e: Exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "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/withNativeCallVoip.js

@@ -9,7 +9,8 @@ function withMainActivityDataFix(config) {
             'import android.view.WindowManager',
             'import android.os.Build',
             'import android.os.Bundle',
-            'import android.content.Intent'
+            'import android.content.Intent',
+            'import android.content.Context' // Added: Required for KEYGUARD_SERVICE
         ];
 
         imports.forEach(imp => {
@@ -18,14 +19,6 @@ function withMainActivityDataFix(config) {
             }
         });
 
-        imports.forEach(imp => {
-            if (!contents.includes(imp)) {
-                contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
-            }
-        });
-
-        // FIXED: Corrected Kotlin bitwise OR syntax and logic check
-        // We check for "navigatingToCall" so this only runs when Answer is tapped
         const wakeLogic = `super.onCreate(savedInstanceState)
     if (intent?.getBooleanExtra("navigatingToCall", false) == true) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
@@ -35,13 +28,10 @@ function withMainActivityDataFix(config) {
             window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
         }
         
-        // Remove Keyguard so we jump straight to app (optional but recommended)
         val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as? android.app.KeyguardManager
         keyguardManager?.requestDismissKeyguard(this, null)
     }`;
 
-
-
         if (!contents.includes('setShowWhenLocked')) {
             contents = contents.replace(/super\.onCreate\(.*\)/, wakeLogic);
         }
@@ -67,7 +57,7 @@ function withAndroidConfig(config) {
         const androidManifest = config.modResults.manifest;
         const mainApplication = androidManifest.application[0];
 
-        // 2. Permissions
+        // Permissions
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
@@ -88,7 +78,7 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 3. Activity/Service/Receiver registration (Cleaned up duplicates)
+        // Activity Registration: AcceptCallActivity
         mainApplication.activity = mainApplication.activity || [];
         if (!mainApplication.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
             mainApplication.activity.push({
@@ -96,8 +86,19 @@ function withAndroidConfig(config) {
                     'android:name': 'com.rnsnativecall.AcceptCallActivity',
                     'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
                     'android:exported': 'false',
-                    'android:showWhenLocked': 'false',
-                    'android:turnScreenOn': 'false'
+                    'android:showWhenLocked': 'true', // Changed to true for calling
+                    'android:turnScreenOn': 'true'     // Changed to true for calling
+                }
+            });
+        }
+
+        // Receiver Registration: CallActionReceiver
+        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'
                 }
             });
         }
@@ -112,7 +113,7 @@ function withAndroidConfig(config) {
             });
         }
 
-        // Headless Task Service (Fixed for Android 14)
+        // Headless Task Service (Android 14)
         const headlessName = 'com.rnsnativecall.CallHeadlessTask';
         const headlessIndex = mainApplication.service.findIndex(s => s.$['android:name'] === headlessName);
         const headlessEntry = {