rns-nativecall 0.3.8 → 0.3.9

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

@@ -23,7 +23,7 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
             writableMap
         }
         promise.resolve(data)
-        pendingCallDataMap = null // Clear after use
+        pendingCallDataMap = null
     }
 
     @ReactMethod
@@ -48,7 +48,7 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
         pendingCallDataMap = null
         
         val notificationManager = reactApplicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(101)
+        notificationManager.cancel(uuid.hashCode())
     }
 
     @ReactMethod

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

@@ -14,7 +14,6 @@ import android.graphics.Color
 object NativeCallManager {
 
     private var ringtone: Ringtone? = null
-    const val INCOMING_CALL_ID = 101
     const val CALL_CHANNEL_ID = "CALL_CHANNEL_ID"
 
     fun handleIncomingPush(context: Context, data: Map<String, String>) {
@@ -50,9 +49,10 @@ object NativeCallManager {
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(CALL_CHANNEL_ID, "Incoming Calls", NotificationManager.IMPORTANCE_HIGH).apply {
+            val channel = NotificationChannel(CALL_CHANNEL_ID, "Incoming Call", NotificationManager.IMPORTANCE_HIGH).apply {
                 setBypassDnd(true)
                 lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
+                enableVibration(true) //can be removed
                 setSound(null, null) 
             }
             notificationManager.createNotificationChannel(channel)
@@ -62,11 +62,13 @@ object NativeCallManager {
             .setSmallIcon(context.applicationInfo.icon)
             .setContentTitle("Incoming $callType call")
             .setContentText(name)
-            .setPriority(NotificationCompat.PRIORITY_MAX)
+
+            .setPriority(NotificationCompat.PRIORITY_HIGH) //old was PRIORITY_MAX
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setOngoing(true) 
             .setAutoCancel(false)
-            .setFullScreenIntent(fullScreenPendingIntent, true) 
+            
+            .setFullScreenIntent(fullScreenPendingIntent, false) //can be true
             .addAction(0, "Answer", fullScreenPendingIntent)
             .addAction(0, "Decline", rejectPendingIntent)
 

package/app.plugin.js

@@ -1,6 +1,13 @@
-////Users/bush/Desktop/Apps/Raiidr/package/app.plugin.js
+///app.plugin.js
+const { withPlugins } = require('@expo/config-plugins');
 const withNativeCallVoip = require('./withNativeCallVoip');
+const withCallNativeConfig = require('./withCallNativeConfig');
+const withCallPermissions = require('./withCallPermissions');
 
-module.exports = function (config) {
-    return withNativeCallVoip(config);
+module.exports = function (config, props) {
+    return withPlugins(config, [
+        [withNativeCallVoip, props],
+        [withCallNativeConfig, props],
+        [withCallPermissions, props],
+    ]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.3.8",
+    "version": "0.3.9",
     "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",
@@ -44,6 +44,7 @@
         "README.md",
         "rns-nativecall.podspec",
         "withCallNativeConfig.js",
+        "withCallPermissions.js",
         "withNativeCallVoip.js"
     ],
     "peerDependencies": {

package/withCallPermissions.js

@@ -0,0 +1,40 @@
+const { withAndroidManifest } = require("@expo/config-plugins");
+
+/** 2. ANDROID MANIFEST MOD **/
+function withCallPermissions(config) {
+    return withAndroidManifest(config, async (config) => {
+        const androidManifest = config.modResults.manifest;
+
+        // 1. Add the Full Screen Intent Permission
+        if (!androidManifest["uses-permission"]) {
+            androidManifest["uses-permission"] = [];
+        }
+
+        const hasPermission = androidManifest["uses-permission"].some(
+            (p) => p.$["android:name"] === "android.permission.USE_FULL_SCREEN_INTENT"
+        );
+
+        if (!hasPermission) {
+            androidManifest["uses-permission"].push({
+                $: { "android:name": "android.permission.USE_FULL_SCREEN_INTENT" },
+            });
+        }
+
+        // 2. Ensure the Activity has the correct flags to appear over lockscreen
+        const mainApplication = androidManifest.application[0];
+        const mainActivity = mainApplication.activity.find(
+            (a) => a.$["android:name"] === ".MainActivity"
+        );
+
+        if (mainActivity) {
+            mainActivity.$["android:showOnLockScreen"] = "true";
+            mainActivity.$["android:lockTaskMode"] = "if_whitelisted";
+        }
+
+        return config;
+    });
+}
+
+module.exports = (config) => {
+    return withPlugins(config, [withCallPermissions]);
+};

package/withNativeCallVoip.js

@@ -1,46 +1,140 @@
 const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = require('@expo/config-plugins');
 
+/** 1. ANDROID MAIN ACTIVITY MOD **/
+// function withMainActivityDataFix(config) {
+//     return withMainActivity(config, (config) => {
+//         let contents = config.modResults.contents;
+
+//         // 1. Ensure necessary Imports are present
+//         if (!contents.includes('import android.content.Intent')) {
+//             contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
+//         }
+//         if (!contents.includes('import android.os.Bundle')) {
+//             contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.os.Bundle`);
+//         }
+
+//         // 2. Define the code blocks
+//         const onNewIntentCode = `
+//   override fun onNewIntent(intent: Intent) {
+//     super.onNewIntent(intent)
+//     setIntent(intent)
+//   }
+// `;
+
+//         const onCreateCode = `
+//   override fun onCreate(savedInstanceState: Bundle?) {
+//     super.onCreate(savedInstanceState)
+//     // If woken up silently, move to back to prevent UI flicker
+//     if (intent.getBooleanExtra("background_wake", false)) {
+//         moveTaskToBack(true)
+//     }
+//   }
+// `;
+
+//         // 3. Insert the codes before the last closing brace of the class
+//         if (!contents.includes('override fun onNewIntent')) {
+//             const lastBraceIndex = contents.lastIndexOf('}');
+//             contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
+//         }
+
+//         if (!contents.includes('override fun onCreate')) {
+//             // Re-calculate lastBraceIndex because contents string has changed
+//             const lastBraceIndex = contents.lastIndexOf('}');
+//             contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
+//         }
+
+//         config.modResults.contents = contents;
+//         return config;
+//     });
+// }
+
 /** 1. ANDROID MAIN ACTIVITY MOD **/
 function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // 1. Ensure necessary Imports are present
-        if (!contents.includes('import android.content.Intent')) {
-            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
+        // --- 1. Imports ---
+        const neededImports = [
+            'import android.view.WindowManager',
+            'import android.os.Build',
+            'import android.os.Bundle'
+        ];
+
+        neededImports.forEach(imp => {
+            if (!contents.includes(imp)) {
+                contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
+            }
+        });
+
+        // --- 2. Replace onCreate ---
+        // We look for the existing onCreate and replace the entire block with your version
+        const editedOnCreate = `
+    // override fun onCreate(savedInstanceState: Bundle?) {
+    //     setTheme(R.style.AppTheme)
+    //     super.onCreate(savedInstanceState)
+
+    //     // --- LOCK SCREEN WAKE LOGIC ---
+    //     // This allows the Activity to appear over the lock screen when Answer is pressed
+    //     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
+    //         )
+    //     }
+    // }
+        override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.AppTheme)
+        super.onCreate(savedInstanceState)
+
+        // Only wake the screen/bypass lock if we are coming from a notification interaction
+        // Otherwise, let the notification pill handle the UI.
+        if (intent?.action?.startsWith("ACTION_SHOW_UI") == true) {
+            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
+                )
+            }
         }
-        if (!contents.includes('import android.os.Bundle')) {
-            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.os.Bundle`);
+    }
+    `;
+
+
+
+
+        // Regex to find the existing onCreate block (including the setTheme and super calls)
+        const onCreateRegex = /override fun onCreate\(savedInstanceState: Bundle\?\).*?\{[\s\S]*?super\.onCreate\(null\)\n\s*\}/;
+        if (contents.match(onCreateRegex)) {
+            contents = contents.replace(onCreateRegex, editedOnCreate);
         }
 
-        // 2. Define the code blocks
+        // --- 3. Update createReactActivityDelegate ---
+        // Removing the "object :" and the empty trailing block "{})" to match your edited version
+        contents = contents.replace(
+            /return ReactActivityDelegateWrapper\([\s\S]*?object : (DefaultReactActivityDelegate\([\s\S]*?\))\{\}\)/,
+            'return ReactActivityDelegateWrapper($1)'
+        );
+
+        // --- 4. Ensure onNewIntent exists ---
         const onNewIntentCode = `
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    setIntent(intent)
-  }
-`;
-
-        const onCreateCode = `
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    // If woken up silently, move to back to prevent UI flicker
-    if (intent.getBooleanExtra("background_wake", false)) {
-        moveTaskToBack(true)
-    }
-  }
-`;
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+    }`;
 
-        // 3. Insert the codes before the last closing brace of the class
         if (!contents.includes('override fun onNewIntent')) {
             const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
-        }
-
-        if (!contents.includes('override fun onCreate')) {
-            // Re-calculate lastBraceIndex because contents string has changed
-            const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
+            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + "\n" + contents.slice(lastBraceIndex);
         }
 
         config.modResults.contents = contents;