rns-nativecall 0.7.9 → 0.8.1

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

@@ -0,0 +1,26 @@
+package com.rnsnativecall
+
+import android.app.Activity
+import android.os.Build
+import android.os.Bundle
+import android.view.WindowManager
+
+class NotificationOverlayActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // These flags allow the notification pill to show over the lockscreen
+        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
+            )
+        }
+        finish()
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.rnsnativecall
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class UnlockReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        android.util.Log.d("UnlockReceiver", "Device Unlocked! Action: ${intent.action}")
+        
+        if (intent.action == Intent.ACTION_USER_PRESENT) {
+            val activeData = NativeCallManager.getCurrentCallData()
+            
+            if (activeData != null) {
+                android.util.Log.d("UnlockReceiver", "Re-triggering call for: ${activeData["name"]}")
+                NativeCallManager.handleIncomingPush(context, activeData)
+            } else {
+                android.util.Log.d("UnlockReceiver", "No active call data found to re-trigger.")
+            }
+        }
+    }
+}

package/android/src/main/res/drawable/circle_background.xml

@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#333333" />
+</shape>

package/android/src/main/res/drawable/ic_call_answer_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57a1.02,1.02 0,0 0,-1.02 0.24l-2.2,2.2a15.05,15.05 0,0 1,-6.59 -6.59l2.2,-2.2a1.02,1.02 0,0 0,0.24 -1.02A11.36,11.36 0,0 1,8.5 4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z" />
+</vector>

package/android/src/main/res/drawable/ic_call_end_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.65,1.45 -1.65,2.58c0,1.65 1.34,3 3,3h2v-3H8.1c0.01,-0.99 0.87,-1.8 1.85,-1.8c0.51,0 1,-0.21 1.35,-0.56l1.8,-1.8C13.04,9.3 12.55,9 12,9z" />
+</vector>

package/android/src/main/res/layout/activity_incoming_call.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#212121">
+
+    <!-- Profile Section -->
+    <ImageView
+        android:id="@+id/profileImage"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:scaleType="centerCrop"
+        android:background="@drawable/circle_background"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/usernameText"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintVertical_bias="0.35"
+        tools:src="@drawable/ic_profile_placeholder" />
+
+    <!-- Optional: Blur effect for discreet mode (apply programmatically) -->
+    <!-- You can use RenderScript or BlurView library for real blur -->
+
+    <TextView
+        android:id="@+id/usernameText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="John Doe"
+        android:textColor="#FFFFFF"
+        android:textSize="32sp"
+        android:fontFamily="sans-serif-medium"
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toBottomOf="@id/profileImage"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="John Doe" />
+
+    <TextView
+        android:id="@+id/callStatusText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Incoming Video Call..."
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        android:alpha="0.8"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/usernameText"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Action Buttons Container -->
+    <LinearLayout
+        android:id="@+id/buttonContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:paddingBottom="100dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <!-- Decline Button -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_marginEnd="60dp">
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                app:cardCornerRadius="35dp"
+                app:cardElevation="8dp"
+                app:cardBackgroundColor="#FF3B30">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_call_end_white"
+                    android:padding="18dp"
+                    android:tint="#FFFFFF" />
+
+            </androidx.cardview.widget.CardView>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Decline"
+                android:textColor="#FFFFFF"
+                android:textSize="16sp"
+                android:fontFamily="sans-serif-medium"
+                android:layout_marginTop="10dp" />
+
+        </LinearLayout>
+
+        <!-- Accept Button -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_marginStart="60dp">
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                app:cardCornerRadius="35dp"
+                app:cardElevation="8dp"
+                app:cardBackgroundColor="#4CD964">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_call_answer_white"
+                    android:padding="18dp"
+                    android:tint="#FFFFFF" />
+
+            </androidx.cardview.widget.CardView>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Accept"
+                android:textColor="#FFFFFF"
+                android:textSize="16sp"
+                android:fontFamily="sans-serif-medium"
+                android:layout_marginTop="10dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

package/index.d.ts

@@ -78,6 +78,12 @@ export interface CallHandlerType {
      */
     checkCallStatus(uuid: string): Promise<CallStatus>;
 
+    requestOverlayPermission(): Promise<boolean>;
+
+    reportRemoteEnded(uuid: string, reason: number): void;
+
+    checkOverlayPermission(): Promise<boolean>;
+
     /**
      * Forcefully dismisses the native call UI, stops the ringtone, and clears state.
      * Use this when the call is hung up or timed out.

package/index.js

@@ -47,6 +47,21 @@ export const CallHandler = {
     },
     // ------------------------------------
 
+    reportRemoteEnded: async (uuid, endReason) => {
+        if (!CallModule?.reportRemoteEnded) return;
+        await CallModule.reportRemoteEnded(uuid.toLowerCase().trim(), endReason);
+    },
+
+    requestOverlayPermission: async () => {
+        if (!CallModule?.requestOverlayPermission) return false;
+        return await CallModule.requestOverlayPermission();
+    },
+
+    checkOverlayPermission: async () => {
+        if (!CallModule?.checkOverlayPermission) return false;
+        return await CallModule.checkOverlayPermission();
+    },
+
     displayCall: async (uuid, name, callType = "audio") => {
         if (!CallModule) return false;
         return await CallModule.displayIncomingCall(uuid.toLowerCase().trim(), name, callType);

package/ios/CallModule.m

@@ -3,6 +3,7 @@
 
 @interface CallModule ()
 @property (nonatomic, strong) NSString *pendingCallUuid;
+@property (nonatomic, strong) NSMutableDictionary *pendingEvents;
 @end
 
 @implementation CallModule
@@ -20,6 +21,7 @@ RCT_EXPORT_MODULE();
 - (instancetype)init {
     self = [super init];
     if (self) {
+        self.pendingEvents = [NSMutableDictionary new];
         NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
 
         CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:appName];
@@ -35,6 +37,34 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
+// MARK: - New Parity Methods (Synced with Android)
+
+RCT_EXPORT_METHOD(checkCallValidity:(NSString *)uuidString resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL isCurrent = [uuidString isEqualToString:self.currentCallUUID.UUIDString];
+    resolve(@{
+        @"isValid": @(isCurrent),
+        @"isCanceled": @(!isCurrent)
+    });
+}
+
+RCT_EXPORT_METHOD(getInitialCallData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    
+    if (self.pendingCallUuid) {
+        result[@"default"] = @{@"callUuid": self.pendingCallUuid};
+        self.pendingCallUuid = nil;
+    }
+    
+    if (self.pendingEvents.count > 0) {
+        [result addEntriesFromDictionary:self.pendingEvents];
+        [self.pendingEvents removeAllObjects];
+    }
+    
+    resolve(result.count > 0 ? result : [NSNull null]);
+}
+
+// MARK: - Core Logic
+
 RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
                   name:(NSString *)name
                   callType:(NSString *)callType
@@ -50,9 +80,9 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     self.currentCallUUID = uuid;
 
     AVAudioSession *session = [AVAudioSession sharedInstance];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord 
-                    mode:AVAudioSessionModeVoiceChat 
-                 options:AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker
+    [session setCategory:AVAudioSessionCategoryPlayAndRecord
+                    mode:AVAudioSessionModeVoiceChat
+                 options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker
                    error:nil];
 
     CXCallUpdate *update = [[CXCallUpdate alloc] init];
@@ -68,38 +98,35 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }];
 }
 
-RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
-{
+// Handles programmatic ending (e.g., via FCM "CANCEL")
+RCT_EXPORT_METHOD(reportRemoteEnded:(NSString *)uuidString reason:(NSInteger)reason) {
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     if (!uuid) return;
 
-    [self.provider reportCallWithUUID:uuid 
-                          endedAtDate:[NSDate date] 
-                               reason:CXCallEndedReasonRemoteEnded];
-    self.currentCallUUID = nil;
-    self.pendingCallUuid = nil;
-}
-
-RCT_EXPORT_METHOD(getInitialCallData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    if (self.pendingCallUuid) {
-        resolve(@{@"callUuid": self.pendingCallUuid});
-        self.pendingCallUuid = nil; 
-    } else {
-        resolve([NSNull null]);
+    // Report to CallKit that the remote user ended the call
+    [self.provider reportCallWithUUID:uuid
+                          endedAtDate:[NSDate date]
+                               reason:(CXCallEndedReason)reason];
+    
+    // Clear local tracking
+    if ([uuid isEqual:self.currentCallUUID]) {
+        self.currentCallUUID = nil;
+        self.pendingCallUuid = nil;
     }
 }
 
-RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    resolve(@YES);
+RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
+{
+    [self reportRemoteEnded:uuidString reason:CXCallEndedReasonRemoteEnded];
 }
 
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
     AVAudioSession *session = [AVAudioSession sharedInstance];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord 
-                    mode:AVAudioSessionModeVoiceChat 
-                 options:AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker 
+    [session setCategory:AVAudioSessionCategoryPlayAndRecord
+                    mode:AVAudioSessionModeVoiceChat
+                 options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker
                    error:nil];
     [session setActive:YES error:nil];
 
@@ -108,9 +135,12 @@ RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve reject
     NSString *uuidStr = [action.callUUID.UUIDString lowercaseString];
     self.pendingCallUuid = uuidStr;
 
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        // NUDGE: Force the window to become visible. 
-        // This helps transition from "Ghost Mode" to "Active UI" once the user unlocks.
+    // Switch from system UI to App UI
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self.provider reportCallWithUUID:action.callUUID
+                          endedAtDate:[NSDate date]
+                                reason:CXCallEndedReasonAnsweredElsewhere];
+        
         dispatch_async(dispatch_get_main_queue(), ^{
             [[[UIApplication sharedApplication] keyWindow] makeKeyAndVisible];
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.7.9",
+    "version": "0.8.1",
     "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,35 +5,54 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // Ensure Intent import for Kotlin
-        if (!contents.includes('import android.content.Intent')) {
-            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
-        }
+        const imports = [
+            'import android.content.Intent',
+            'import android.os.Bundle',
+            'import android.view.WindowManager',
+            'import android.os.Build'
+        ];
 
-        const onNewIntentCode = `
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    setIntent(intent)
-  }
-`;
+        // Add imports if they don't exist
+        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)
-    
-    // If background wake from FCM, move to back to let LockScreen UI show
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+        setShowWhenLocked(false)
+        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
+        )
+    }
     if (intent.getBooleanExtra("background_wake", false)) {
         moveTaskToBack(true)
     }
-  }
-`;
-        if (!contents.includes('override fun onNewIntent')) {
-            const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
-        }
+  }`;
+
+        const onNewIntentCode = `
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }`;
+
+        // Use a more flexible regex for the class definition
+        const classRegex = /class MainActivity\s*:\s*ReactActivity\(\)\s*\{/;
+
         if (!contents.includes('override fun onCreate')) {
-            const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
+            contents = contents.replace(classRegex, (match) => `${match}${onCreateCode}`);
+        }
+
+        if (!contents.includes('override fun onNewIntent')) {
+            // Re-run match check because contents might have changed from onCreate injection
+            contents = contents.replace(classRegex, (match) => `${match}${onNewIntentCode}`);
         }
 
         config.modResults.contents = contents;
@@ -47,79 +66,115 @@ function withAndroidConfig(config) {
         const manifest = config.modResults;
         const application = manifest.manifest.application[0];
 
-        // Comprehensive list for VoIP & Foreground Services
+        // Ensure MainActivity flags
+        const mainActivity = application.activity.find((a) => a.$['android:name'] === '.MainActivity');
+        if (mainActivity) {
+            mainActivity.$['android:launchMode'] = 'singleTop';
+            mainActivity.$['android:showWhenLocked'] = 'false';
+            mainActivity.$['android:turnScreenOn'] = 'true';
+        }
+
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
             'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
             'android.permission.POST_NOTIFICATIONS',
-            'android.permission.SYSTEM_ALERT_WINDOW',
             'android.permission.WAKE_LOCK',
             'android.permission.DISABLE_KEYGUARD',
-            'android.permission.MANAGE_OWN_CALLS'
+            'android.permission.SYSTEM_ALERT_WINDOW'
         ];
 
+        // Initialize permissions array if missing
         manifest.manifest['uses-permission'] = manifest.manifest['uses-permission'] || [];
+
         permissions.forEach((perm) => {
             if (!manifest.manifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
                 manifest.manifest['uses-permission'].push({ $: { 'android:name': perm } });
             }
         });
 
+        // Initialize components if missing
+        application.service = application.service || [];
         application.activity = application.activity || [];
-        // AcceptCallActivity registration
-        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
-            application.activity.push({
-                $: {
-                    'android:name': 'com.rnsnativecall.AcceptCallActivity',
-                    'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
-                    'android:excludeFromRecents': 'true',
-                    'android:noHistory': 'true',
-                    'android:exported': 'false',
-                    'android:launchMode': 'singleInstance',
-                    'android:showWhenLocked': 'true',
-                    'android:turnScreenOn': 'true'
-                }
-            });
-        }
+        application.receiver = application.receiver || [];
 
-        application.service = application.service || [];
+        // 1. Services
+        const services = [
+            { name: 'com.rnsnativecall.CallMessagingService', exported: 'false', filter: 'com.google.firebase.MESSAGING_EVENT' },
+            { name: 'com.rnsnativecall.CallForegroundService', type: 'phoneCall' },
+            { name: 'com.rnsnativecall.CallHeadlessTask' }
+        ];
 
-        // 1. Firebase Messaging Service
-        const firebaseServiceName = 'com.rnsnativecall.CallMessagingService';
-        if (!application.service.some(s => s.$['android:name'] === firebaseServiceName)) {
-            application.service.push({
-                $: { 'android:name': firebaseServiceName, 'android:exported': 'false' },
-                'intent-filter': [{ action: [{ $: { 'android:name': 'com.google.firebase.MESSAGING_EVENT' } }] }]
-            });
-        }
+        services.forEach(svc => {
+            if (!application.service.some(s => s.$['android:name'] === svc.name)) {
+                const entry = { $: { 'android:name': svc.name, 'android:exported': svc.exported || 'false' } };
+                if (svc.type) entry.$['android:foregroundServiceType'] = svc.type;
+                if (svc.filter) {
+                    entry['intent-filter'] = [{ action: [{ $: { 'android:name': svc.filter } }] }];
+                }
+                application.service.push(entry);
+            }
+        });
 
-        // 2. Headless 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' }
-            });
-        }
+        // 2. Activities (Trampoline & Overlay)
+        const activities = [
+            {
+                name: 'com.rnsnativecall.AcceptCallActivity',
+                theme: '@android:style/Theme.Translucent.NoTitleBar',
+                launchMode: 'singleInstance'
+            },
+            {
+                name: 'com.rnsnativecall.NotificationOverlayActivity',
+                theme: '@android:style/Theme.NoTitleBar.Fullscreen',
+                launchMode: 'singleInstance'
+            }
+        ];
+
+        activities.forEach(act => {
+            if (!application.activity.some(a => a.$['android:name'] === act.name)) {
+                application.activity.push({
+                    $: {
+                        'android:name': act.name,
+                        'android:theme': act.theme,
+                        'android:exported': 'false',
+                        'android:showWhenLocked': 'true',
+                        'android:turnScreenOn': 'true',
+                        'android:excludeFromRecents': 'true',
+                        'android:noHistory': 'true',
+                        'android:launchMode': act.launchMode
+                    }
+                });
+            }
+        });
 
-        // 3. Foreground Service (The "Connecting..." spinner)
-        const foregroundServiceName = 'com.rnsnativecall.CallForegroundService';
-        if (!application.service.some(s => s.$['android:name'] === foregroundServiceName)) {
-            application.service.push({
+        // 3. Receiver
+        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
+            application.receiver.push({
                 $: {
-                    'android:name': foregroundServiceName,
-                    'android:foregroundServiceType': 'phoneCall',
+                    'android:name': 'com.rnsnativecall.CallActionReceiver',
                     'android:exported': 'false'
                 }
             });
         }
 
-        application.receiver = application.receiver || [];
-        const receiverName = 'com.rnsnativecall.CallActionReceiver';
-        if (!application.receiver.some(r => r.$['android:name'] === receiverName)) {
+        // ADD THIS: UnlockReceiver with USER_PRESENT filter
+        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.UnlockReceiver')) {
             application.receiver.push({
-                $: { 'android:name': receiverName, 'android:exported': 'false' }
+                $: {
+                    'android:name': 'com.rnsnativecall.UnlockReceiver',
+                    'android:exported': 'true',
+                    'android:enabled': 'true',
+                    'android:directBootAware': 'true', // Helps bypass some background restrictions
+                },
+                'intent-filter': [
+                    {
+                        $: { 'android:priority': '1000' },
+                        action: [
+                            { $: { 'android:name': 'android.intent.action.USER_PRESENT' } }
+                        ]
+                    }
+                ]
             });
         }
 
@@ -132,13 +187,20 @@ function withIosConfig(config) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;
         if (!infoPlist.UIBackgroundModes) infoPlist.UIBackgroundModes = [];
-        ['voip', 'audio'].forEach(mode => {
-            if (!infoPlist.UIBackgroundModes.includes(mode)) infoPlist.UIBackgroundModes.push(mode);
+
+        ['voip', 'audio', 'remote-notification'].forEach(mode => {
+            if (!infoPlist.UIBackgroundModes.includes(mode)) {
+                infoPlist.UIBackgroundModes.push(mode);
+            }
         });
         return config;
     });
 }
 
 module.exports = (config) => {
-    return withPlugins(config, [withAndroidConfig, withMainActivityDataFix, withIosConfig]);
-};
+    return withPlugins(config, [
+        withAndroidConfig,
+        withMainActivityDataFix,
+        withIosConfig
+    ]);
+};