rns-nativecall 0.9.0 → 0.9.2

package/package.json

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

@@ -157,34 +157,34 @@ function withIosAppDelegateMod(config) {
     return withAppDelegate(config, (config) => {
         let contents = config.modResults.contents;
 
-        // 1. Check for the import
-        if (!contents.includes('#import <React/RCTLinkingManager.h>')) {
-            contents = '#import <React/RCTLinkingManager.h>\n' + contents;
+        // 1. In Swift, we don't use #import. We just ensure 'React' is imported.
+        if (!contents.includes('import React')) {
+            contents = contents.replace(/import ExpoAppDelegate/, 'import React\nimport ExpoAppDelegate');
         }
 
-        // 2. Only inject if the method name doesn't exist AT ALL
-        // This prevents the "Duplicate Method" error
-        if (!contents.includes('continueUserActivity')) {
-            const linkingCode = `
-- (BOOL)application:(UIApplication *)application
-   continueUserActivity:(NSUserActivity *)userActivity
-     restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler
-{
-  return [RCTLinkingManager application:application
-                   continueUserActivity:userActivity
-                     restorationHandler:restorationHandler];
-}
-`;
-            // Inject before the LAST @end in the file
-            const parts = contents.split('@end');
-            const lastPart = parts.pop();
-            contents = parts.join('@end') + linkingCode + '\n@end' + lastPart;
-        } else {
-            // 3. If it DOES exist, ensure RCTLinkingManager is inside it
-            // Many Expo apps have an empty continueUserActivity or one that only handles notifications
-            if (!contents.includes('RCTLinkingManager')) {
-                console.warn("[rns-nativecall] continueUserActivity exists but doesn't have RCTLinkingManager. Manual check required.");
+        // 2. Look for the Swift version of continue userActivity
+        // We check if it already exists to avoid duplication
+        if (contents.includes('continue userActivity')) {
+            // If it exists but doesn't have RCTLinkingManager, inject it inside the existing method
+            if (!contents.includes('RCTLinkingManager.application')) {
+                contents = contents.replace(
+                    /public override func application\((\s*)_ application: UIApplication,(\s*)continue userActivity: NSUserActivity,/,
+                    `public override func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {\n    let _ = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)\n`
+                );
             }
+        } else {
+            // 3. If the method doesn't exist at all, add the Swift version before the last closing brace
+            const swiftLinkingCode = `
+  public override func application(
+    _ application: UIApplication,
+    continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
+  ) -> Bool {
+    let result = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)
+    return super.application(application, continue: userActivity, restorationHandler: restorationHandler) || result
+  }
+`;
+            contents = contents.replace(/}\s*$/, `${swiftLinkingCode}\n}`);
         }
 
         config.modResults.contents = contents;
@@ -211,6 +211,7 @@ module.exports = (config, props) => {
     return withPlugins(config, [
         withAndroidConfig,
         withMainActivityDataFix,
+        withIosAppDelegateMod, // <--- ADDED THIS HERE
         [withIosConfig, props]
     ]);
 };