rns-nativecall 0.2.7 → 0.3.0

package/android/build.gradle

@@ -35,12 +35,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17' // Changed from 1.8
     }
 
     // lintOptions is deprecated in newer AGP, using lint instead

package/package.json

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

@@ -5,12 +5,10 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // Ensure Intent import exists
         if (!contents.includes('import android.content.Intent')) {
             contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
         }
 
-        // Add onNewIntent to catch data when app is open
         const onNewIntentCode = `
   override fun onNewIntent(intent: Intent) {
     super.onNewIntent(intent)
@@ -34,15 +32,15 @@ function withAndroidConfig(config) {
         const manifest = config.modResults;
         const application = manifest.manifest.application[0];
 
-        // 1. Updated Permissions for Custom Notifications & Android 13/14
+        // 1. Unified Permissions
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
-            'android.permission.FOREGROUND_SERVICE_PHONE_CALL', // Required for Android 14
-            'android.permission.POST_NOTIFICATIONS',            // Required for Android 13+
-            'android.permission.WAKE_LOCK',                     // Helps wake the screen
-            'android.permission.DISABLE_KEYGUARD'               // Allows showing over lockscreen
+            'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
+            'android.permission.POST_NOTIFICATIONS',
+            'android.permission.WAKE_LOCK',
+            'android.permission.DISABLE_KEYGUARD'
         ];
 
         manifest.manifest['uses-permission'] = manifest.manifest['uses-permission'] || [];
@@ -52,51 +50,54 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 2. AcceptCallActivity - The "Pill" UI handler
-        // Added showWhenLocked and turnScreenOn for the "Gate" logic
+        // 2. Activity Cleanup & Setup
         application.activity = application.activity || [];
-        const acceptActivityName = 'com.rnsnativecall.AcceptCallActivity';
 
-        // Remove old entry if exists to avoid duplicates
-        application.activity = application.activity.filter(a => a.$['android:name'] !== acceptActivityName);
+        // Remove old/redundant activities
+        application.activity = application.activity.filter(a =>
+            a.$['android:name'] !== 'com.rnsnativecall.IncomingCallActivity' &&
+            a.$['android:name'] !== 'com.rnsnativecall.AcceptCallActivity'
+        );
 
+        // Add the specific AcceptCallActivity (Trampoline)
         application.activity.push({
             $: {
-                'android:name': acceptActivityName,
+                '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',  // CRUCIAL: Show over lockscreen
-                'android:turnScreenOn': 'true'     // CRUCIAL: Wake device
+                'android:showWhenLocked': 'true',
+                'android:turnScreenOn': 'true'
             }
         });
 
-        // 3. Updated Services
+        // 3. Service Cleanup & Setup (Firebase only)
         application.service = application.service || [];
-        // Removed MyConnectionService as you are no longer using Telecom
-        const services = [
-            { name: 'com.rnsnativecall.CallMessagingService', action: 'com.google.firebase.MESSAGING_EVENT' }
-        ];
 
-        services.forEach(svc => {
-            if (!application.service.some(s => s.$['android:name'] === svc.name)) {
-                application.service.push({
-                    $: {
-                        'android:name': svc.name,
-                        'android:exported': 'false' // Firebase services should usually be false unless needed
-                    },
-                    'intent-filter': [{ action: [{ $: { 'android:name': svc.action } }] }]
-                });
-            }
-        });
+        // Explicitly remove Telecom Service
+        application.service = application.service.filter(
+            s => s.$['android:name'] !== 'com.rnsnativecall.MyConnectionService'
+        );
+
+        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' } }] }]
+            });
+        }
 
-        // 4. Receivers (Answer/Reject Buttons)
+        // 4. Receiver Setup
         application.receiver = application.receiver || [];
-        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
+        const receiverName = 'com.rnsnativecall.CallActionReceiver';
+        if (!application.receiver.some(r => r.$['android:name'] === receiverName)) {
             application.receiver.push({
-                $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' }
+                $: { 'android:name': receiverName, 'android:exported': 'false' }
             });
         }
 
@@ -109,7 +110,9 @@ 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'].forEach(mode => {
+            if (!infoPlist.UIBackgroundModes.includes(mode)) infoPlist.UIBackgroundModes.push(mode);
+        });
         return config;
     });
 }

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

@@ -1,93 +0,0 @@
-package com.rnsnativecall
-
-import android.app.*
-import android.content.Context
-import android.content.Intent
-import android.media.AudioAttributes
-import android.media.MediaPlayer
-import android.media.RingtoneManager
-import android.os.Build
-import androidx.core.app.NotificationCompat
-
-object NativeCallManager {
-    private var mediaPlayer: MediaPlayer? = null
-    private const val CHANNEL_ID = "incoming_calls"
-    private const val NOTIFICATION_ID = 101
-
-    fun handleIncomingPush(context: Context, data: Map<String, String>) {
-        startRingtone(context)
-        showIncomingCallNotification(context, data)
-    }
-
-    private fun startRingtone(context: Context) {
-        if (mediaPlayer != null) return
-        try {
-            val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-            mediaPlayer = MediaPlayer().apply {
-                setDataSource(context, uri)
-                setAudioAttributes(AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                    .build())
-                isLooping = true
-                prepare()
-                start()
-            }
-        } catch (e: Exception) { e.printStackTrace() }
-    }
-
-    fun stopRingtone() {
-        mediaPlayer?.stop()
-        mediaPlayer?.release()
-        mediaPlayer = null
-    }
-
-    private fun showIncomingCallNotification(context: Context, data: Map<String, String>) {
-        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(CHANNEL_ID, "Incoming Calls", NotificationManager.IMPORTANCE_HIGH).apply {
-                lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                enableVibration(true)
-                setSound(null, null) // We handle sound manually via MediaPlayer
-            }
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        // 1. Full Screen Intent (To wake up the screen)
-        val fullScreenIntent = Intent(context, AcceptCallActivity::class.java).apply {
-            data.forEach { (k, v) -> putExtra(k, v) }
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
-        }
-        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-
-        // 2. Answer Action
-        val answerIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_ACCEPT"
-            data.forEach { (k, v) -> putExtra(k, v) }
-        }
-        val answerPendingIntent = PendingIntent.getBroadcast(context, 1, answerIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-
-        // 3. Reject Action
-        val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_REJECT"
-            data.forEach { (k, v) -> putExtra(k, v) }
-        }
-        val rejectPendingIntent = PendingIntent.getBroadcast(context, 2, rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(context.applicationInfo.icon)
-            .setContentTitle("Incoming Call")
-            .setContentText(data["name"] ?: "Unknown Caller")
-            .setPriority(NotificationCompat.PRIORITY_MAX)
-            .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setAutoCancel(true)
-            .setOngoing(true)
-            .setFullScreenIntent(fullScreenPendingIntent, true)
-            .addAction(0, "Answer", answerPendingIntent)
-            .addAction(0, "Decline", rejectPendingIntent)
-
-        notificationManager.notify(NOTIFICATION_ID, builder.build())
-    }
-}

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

@@ -1,101 +0,0 @@
-package com.rnsnativecall
-
-import android.app.*
-import android.content.Context
-import android.content.Intent
-import android.media.AudioAttributes
-import android.media.MediaPlayer
-import android.media.RingtoneManager
-import android.os.Build
-import androidx.core.app.NotificationCompat
-
-object NativeCallManager {
-    private var mediaPlayer: MediaPlayer? = null
-    private const val CHANNEL_ID = "incoming_calls"
-    private const val NOTIFICATION_ID = 101
-
-    fun handleIncomingPush(context: Context, data: Map<String, String>) {
-        startRingtone(context)
-        showNotification(context, data)
-    }
-
-    private fun startRingtone(context: Context) {
-        if (mediaPlayer != null) return
-        try {
-            val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-            mediaPlayer = MediaPlayer().apply {
-                setDataSource(context, uri)
-                setAudioAttributes(AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                    .build())
-                isLooping = true
-                prepare()
-                start()
-            }
-        } catch (e: Exception) { e.printStackTrace() }
-    }
-
-    fun stopRingtone() {
-        mediaPlayer?.stop()
-        mediaPlayer?.release()
-        mediaPlayer = null
-    }
-
-    private fun showNotification(context: Context, data: Map<String, String>) {
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(CHANNEL_ID, "Calls", NotificationManager.IMPORTANCE_HIGH).apply {
-                description = "Incoming call notifications"
-                setSound(null, null) 
-                enableVibration(true)
-            }
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        // 1. Full Screen Intent (Wakes up screen & goes to AcceptCallActivity)
-        val fullScreenIntent = Intent(context, AcceptCallActivity::class.java).apply {
-            data.forEach { (k, v) -> putExtra(k, v) }
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        }
-        val fullScreenPendingIntent = PendingIntent.getActivity(
-            context, 0, fullScreenIntent, 
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        // 2. Answer Button
-        val answerIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_ACCEPT"
-            data.forEach { (k, v) -> putExtra(k, v) }
-        }
-        val answerPendingIntent = PendingIntent.getBroadcast(
-            context, 1, answerIntent, 
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        // 3. Reject Button
-        val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_REJECT"
-            data.forEach { (k, v) -> putExtra(k, v) }
-        }
-        val rejectPendingIntent = PendingIntent.getBroadcast(
-            context, 2, rejectIntent, 
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(android.R.drawable.ic_menu_call) // Replace with your app icon
-            .setContentTitle("Incoming Call")
-            .setContentText(data["name"] ?: "Raiidr User")
-            .setPriority(NotificationCompat.PRIORITY_MAX)
-            .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setFullScreenIntent(fullScreenPendingIntent, true)
-            .setOngoing(true)
-            .setAutoCancel(true)
-            .addAction(0, "Answer", answerPendingIntent)
-            .addAction(0, "Decline", rejectPendingIntent)
-
-        notificationManager.notify(NOTIFICATION_ID, builder.build())
-    }
-}