rns-nativecall 0.2.6 → 0.2.8

package/android/build.gradle

@@ -1,43 +1,71 @@
+// 1. Buildscript defines WHERE to get the plugins
+buildscript {
+    ext.kotlin_version = project.hasProperty('kotlinVersion') ? project.kotlinVersion : '1.8.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+// 2. Apply the plugins immediately after buildscript
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+// 3. Define helper functions
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+// 4. The Android block - should now be recognized
 android {
-    // 1. MATCH NAMESPACE: Ensure this matches the package in your .kt files
+    // Crucial for AGP 7+
     namespace "com.rnsnativecall"
     
-    // 2. TARGET SDK: Android 13 (API 33) is the standard for modern RN apps
-    // This allows you to use the POST_NOTIFICATIONS permission needed for Android 13+
     compileSdkVersion safeExtGet('compileSdkVersion', 33)
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 33)
         
-        // Ensure your library can handle vector icons if you use them in notifications
-        vectorDrawables.useSupportLibrary = true
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    // 3. KOTLIN OPTIONS: Essential for smooth bridge communication
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17' // Changed from 1.8
     }
 
-    lintOptions {
+    // lintOptions is deprecated in newer AGP, using lint instead
+    lint {
         abortOnError false
     }
 }
 
+repositories {
+    mavenCentral()
+    google()
+}
+
 dependencies {
-    implementation "com.facebook.react:react-native:+" 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    // Use 'provided' or 'implementation' depending on how you want to link RN
+    // For most modules, we use implementation but let the app provide the actual binary
+    implementation "com.facebook.react:react-native:+"
     
-    // Firebase - Use a stable version that supports Android 13+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.google.firebase:firebase-messaging:23.4.0"
-
-    // UI & Design
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.core:core-ktx:1.10.1" // Required for NotificationCompat
+    implementation "androidx.core:core-ktx:1.10.1"
     implementation "com.google.android.material:material:1.9.0"
-
-    // 4. Glide for Profile Pictures
-    // If you plan to show the caller's face in the notification
+    
+    // Glide for profile pictures
     implementation "com.github.bumptech.glide:glide:4.15.1"
     annotationProcessor "com.github.bumptech.glide:compiler:4.15.1"
 }

package/package.json

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

@@ -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;
     });
 }