rns-nativecall 0.4.0 → 0.4.1

package/package.json

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

@@ -53,88 +53,49 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // --- 1. Imports ---
-        const neededImports = [
+        // 1. Add necessary Imports safely
+        const imports = [
             'import android.view.WindowManager',
             'import android.os.Build',
-            'import android.os.Bundle'
+            'import android.os.Bundle',
+            'import android.content.Intent'
         ];
-
-        neededImports.forEach(imp => {
+        imports.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
-                )
-            }
+        // 2. Inject onCreate logic without breaking the existing structure
+        // We look for super.onCreate(null) or super.onCreate(savedInstanceState)
+        const wakeLogig = `
+    super.onCreate(savedInstanceState)
+    if (intent?.action?.startsWith("ACTION_SHOW_UI") == true || intent?.getBooleanExtra("background_wake", false) == true) {
+        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)
         }
-    }
-    `;
-
-
-
+    }`;
 
-        // 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);
+        if (!contents.includes('setShowWhenLocked')) {
+            contents = contents.replace(/super\.onCreate\(.*\)/, wakeLogig);
         }
 
-        // --- 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)
-    }`;
+        // 3. REMOVE the "Update createReactActivityDelegate" section entirely.
+        // Modern Expo handles the Wrapper correctly; your regex was breaking the Kotlin syntax.
 
+        // 4. Ensure onNewIntent exists
         if (!contents.includes('override fun onNewIntent')) {
+            const onNewIntentCode = `
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }\n`;
+            // Insert it before the last closing brace of the class
             const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + "\n" + contents.slice(lastBraceIndex);
+            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
         }
 
         config.modResults.contents = contents;