rns-nativecall 1.1.2 → 1.1.4

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

@@ -118,6 +118,14 @@ object NativeCallManager {
         }
     }
 
+    fun refreshNotificationOnly(
+        context: Context,
+        uuid: String,
+    ) {
+        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        manager.cancel(uuid.hashCode())
+    }
+
     fun dismissIncomingCall(
         context: Context,
         uuid: String?,

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

@@ -11,14 +11,10 @@ class UnlockReceiver : BroadcastReceiver() {
         intent: Intent,
     ) {
         if (intent.action == Intent.ACTION_USER_PRESENT) {
-            Log.d("UnlockReceiver", "Device Unlocked - Re-triggering Notification Pill")
-
             val activeData = NativeCallManager.getCurrentCallData()
-
             if (activeData != null) {
-                // We don't launch the app!
-                // We just tell the Manager to show the notification again.
-                // This forces the "Heads-Up" (Pill) to appear on the home screen.
+                val uuid = activeData["callUuid"] ?: "" // Use map access [] instead of getString
+                NativeCallManager.refreshNotificationOnly(context, uuid)
                 NativeCallManager.handleIncomingPush(context, activeData)
             }
         }

package/package.json

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

@@ -1,5 +1,6 @@
 const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity, withAppDelegate } = require('@expo/config-plugins');
 
+/** 1. MAIN ACTIVITY MOD **/
 function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
@@ -13,56 +14,52 @@ function withMainActivityDataFix(config) {
             'import android.Manifest'
         ];
 
-        // Add imports if they don't exist
+        // 1. Add missing imports
         imports.forEach(imp => {
             if (!contents.includes(imp)) {
                 contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
             }
         });
 
-        const onCreateCode = `
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    
-    // Request Notification Permissions for Android 13+ (Required for Pill UI)
+        // 2. Inject VoIP logic into EXISTING onCreate
+        const voipOnCreateLogic = `
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        ActivityCompat.requestPermissions(
-            this,
-            arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-            101
-        )
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.POST_NOTIFICATIONS), 101)
     }
 
     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 or
-            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-        )
+        window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     if (intent.getBooleanExtra("background_wake", false)) {
         moveTaskToBack(true)
     }
-  }`;
-
-        const onNewIntentCode = `
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    setIntent(intent)
-  }`;
-
-        const classRegex = /class MainActivity\s*:\s*ReactActivity\(\)\s*\{/;
-
-        if (!contents.includes('override fun onCreate')) {
-            contents = contents.replace(classRegex, (match) => `${match}${onCreateCode}`);
+  `;
+
+        if (contents.includes('override fun onCreate')) {
+            // If onCreate exists, inject logic after super.onCreate
+            if (!contents.includes('setShowWhenLocked(true)')) {
+                contents = contents.replace(
+                    /super\.onCreate\(.*\)/,
+                    (match) => `${match}\n${voipOnCreateLogic}`
+                );
+            }
         }
 
-        if (!contents.includes('override fun onNewIntent')) {
-            contents = contents.replace(classRegex, (match) => `${match}${onNewIntentCode}`);
+        // 3. Inject VoIP logic into EXISTING onNewIntent
+        const voipOnNewIntentLogic = `
+    setIntent(intent)`;
+
+        if (contents.includes('override fun onNewIntent')) {
+            if (!contents.includes('setIntent(intent)')) {
+                contents = contents.replace(
+                    /super\.onNewIntent\(intent\)/,
+                    (match) => `${match}\n${voipOnNewIntentLogic}`
+                );
+            }
         }
 
         config.modResults.contents = contents;
@@ -149,6 +146,23 @@ function withAndroidConfig(config) {
             application.receiver.push({ $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' } });
         }
 
+        // 2. ADDED UnlockReceiver with intent-filter
+        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.UnlockReceiver')) {
+            application.receiver.push({
+                $: {
+                    'android:name': 'com.rnsnativecall.UnlockReceiver',
+                    'android:exported': 'false'
+                },
+                'intent-filter': [
+                    {
+                        action: [
+                            { $: { 'android:name': 'android.intent.action.USER_PRESENT' } }
+                        ]
+                    }
+                ]
+            });
+        }
+
         return config;
     });
 }