@stream-io/video-react-native-sdk 1.28.1 → 1.29.0-beta.0

package/expo-config-plugin/dist/withAppDelegate.js

@@ -9,7 +9,7 @@ const addNewLinesToAppDelegateObjc_1 = __importDefault(require("./common/addNewL
 const addToSwiftBridgingHeaderFile_1 = require("./common/addToSwiftBridgingHeaderFile");
 const withAppDelegate = (configuration, props) => {
     return (0, config_plugins_1.withAppDelegate)(configuration, (config) => {
-        if (!props?.ringingPushNotifications &&
+        if (!props?.ringing &&
             !props?.iOSEnableMultitaskingCameraAccess &&
             !props?.addNoiseCancellation) {
             // quit early if no change is necessary
@@ -21,19 +21,12 @@ const withAppDelegate = (configuration, props) => {
                     config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, ['"NoiseCancellationManagerObjc.h"']);
                 }
                 config.modResults.contents = addDidFinishLaunchingWithOptionsObjc(config.modResults.contents, props.iOSEnableMultitaskingCameraAccess, props.addNoiseCancellation);
-                if (props?.ringingPushNotifications) {
-                    config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, [
-                        '"RNCallKeep.h"',
-                        '<PushKit/PushKit.h>',
-                        '"RNVoipPushNotificationManager.h"',
-                        '"StreamVideoReactNative.h"',
-                        '<WebRTC/RTCAudioSession.h>',
-                    ]);
+                if (props?.ringing) {
+                    config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, ['<PushKit/PushKit.h>', '"StreamVideoReactNative.h"']);
                     config.modResults.contents =
-                        addDidFinishLaunchingWithOptionsRingingObjc(config.modResults.contents, props.ringingPushNotifications);
+                        addDidFinishLaunchingWithOptionsRingingObjc(config.modResults.contents);
                     config.modResults.contents = addDidUpdatePushCredentialsObjc(config.modResults.contents);
                     config.modResults.contents = addDidReceiveIncomingPushCallbackObjc(config.modResults.contents);
-                    config.modResults.contents = addAudioSessionMethodsObjc(config.modResults.contents);
                 }
                 return config;
             }
@@ -43,7 +36,7 @@ const withAppDelegate = (configuration, props) => {
         }
         else {
             try {
-                if (props?.ringingPushNotifications) {
+                if (props?.ringing) {
                     // make it public class AppDelegate: ExpoAppDelegate, PKPushRegistryDelegate {
                     const regex = /(class\s+AppDelegate[^{]*)(\s*\{)/;
                     config.modResults.contents = config.modResults.contents.replace(regex, (match, declarationPart, openBrace) => {
@@ -76,13 +69,12 @@ const withAppDelegate = (configuration, props) => {
                     config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['stream_io_noise_cancellation_react_native']);
                 }
                 config.modResults.contents = addDidFinishLaunchingWithOptionsSwift(config.modResults.contents, props.iOSEnableMultitaskingCameraAccess, props.addNoiseCancellation);
-                if (props?.ringingPushNotifications) {
-                    config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['RNCallKeep', 'PushKit', 'RNVoipPushNotification']);
+                if (props?.ringing) {
+                    config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['PushKit', 'stream_video_react_native']);
                     config.modResults.contents =
-                        addDidFinishLaunchingWithOptionsRingingSwift(config.modResults.contents, props.ringingPushNotifications);
+                        addDidFinishLaunchingWithOptionsRingingSwift(config.modResults.contents);
                     config.modResults.contents = addDidUpdatePushCredentialsSwift(config.modResults.contents);
                     config.modResults.contents = addDidReceiveIncomingPushCallbackSwift(config.modResults.contents);
-                    config.modResults.contents = addAudioSessionMethodsSwift(config.modResults.contents);
                 }
                 return config;
             }
@@ -127,55 +119,26 @@ function addDidFinishLaunchingWithOptionsObjc(contents, iOSEnableMultitaskingCam
     }
     return contents;
 }
-function addDidFinishLaunchingWithOptionsRingingSwift(contents, ringingPushNotifications) {
+function addDidFinishLaunchingWithOptionsRingingSwift(contents) {
     const functionSelector = 'application(_:didFinishLaunchingWithOptions:)';
-    const supportsVideoString = ringingPushNotifications.disableVideoIos
-        ? 'false'
-        : 'true';
-    const includesCallsInRecents = ringingPushNotifications.includesCallsInRecentsIos ? 'false' : 'true';
-    const setupCallKeep = `  let localizedAppName = Bundle.main.localizedInfoDictionary?["CFBundleDisplayName"] as? String
-    let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String
-    RNCallKeep.setup([
-      "appName": localizedAppName != nil ? localizedAppName! : appName as Any,
-      "supportsVideo": ${supportsVideoString},
-      "includesCallsInRecents": ${includesCallsInRecents},
-    ])`;
-    if (!contents.includes('RNCallKeep.setup')) {
-        contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, setupCallKeep, { position: 'head' });
-    }
     // call the setup of voip push notification
-    const voipSetupMethod = 'RNVoipPushNotificationManager.voipRegistration()';
+    const voipSetupMethod = 'StreamVideoReactNative.voipRegistration()';
     if (!contents.includes(voipSetupMethod)) {
         contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, '  ' /* indentation */ + voipSetupMethod, { position: 'head' });
     }
     return contents;
 }
-function addDidFinishLaunchingWithOptionsRingingObjc(contents, ringingPushNotifications) {
+function addDidFinishLaunchingWithOptionsRingingObjc(contents) {
     const functionSelector = 'application:didFinishLaunchingWithOptions:';
-    // call the setup RNCallKeep
-    const supportsVideoString = ringingPushNotifications.disableVideoIos
-        ? '@NO'
-        : '@YES';
-    const includesCallsInRecents = ringingPushNotifications.includesCallsInRecentsIos ? '@YES' : '@NO';
-    const setupCallKeep = `NSString *localizedAppName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleDisplayName"];
-  NSString *appName = [[[NSBundle mainBundle] infoDictionary]objectForKey :@"CFBundleDisplayName"];
-  [RNCallKeep setup:@{
-    @"appName": localizedAppName != nil ? localizedAppName : appName,
-    @"supportsVideo": ${supportsVideoString},
-    @"includesCallsInRecents": ${includesCallsInRecents},
-  }];`;
-    if (!contents.includes('[RNCallKeep setup:@')) {
-        contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, setupCallKeep, { position: 'head' });
-    }
     // call the setup of voip push notification
-    const voipSetupMethod = '[RNVoipPushNotificationManager voipRegistration];';
+    const voipSetupMethod = '[StreamVideoReactNative voipRegistration];';
     if (!contents.includes(voipSetupMethod)) {
         contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, voipSetupMethod, { position: 'head' });
     }
     return contents;
 }
 function addDidUpdatePushCredentialsSwift(contents) {
-    const updatedPushCredentialsMethod = 'RNVoipPushNotificationManager.didUpdate(credentials, forType: type.rawValue)';
+    const updatedPushCredentialsMethod = 'StreamVideoReactNative.didUpdate(credentials, forType: type.rawValue)';
     if (!contents.includes(updatedPushCredentialsMethod)) {
         const functionSelector = 'pushRegistry(_:didUpdate:for:)';
         const codeblock = (0, codeMod_1.findSwiftFunctionCodeBlock)(contents, functionSelector);
@@ -197,7 +160,7 @@ function addDidUpdatePushCredentialsSwift(contents) {
     return contents;
 }
 function addDidUpdatePushCredentialsObjc(contents) {
-    const updatedPushCredentialsMethod = '[RNVoipPushNotificationManager didUpdatePushCredentials:credentials forType:(NSString *)type];';
+    const updatedPushCredentialsMethod = '[StreamVideoReactNative didUpdatePushCredentials:credentials forType: (NSString *) type];';
     if (!contents.includes(updatedPushCredentialsMethod)) {
         const functionSelector = 'pushRegistry:didUpdatePushCredentials:forType:';
         const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
@@ -214,112 +177,10 @@ function addDidUpdatePushCredentialsObjc(contents) {
     }
     return contents;
 }
-function addAudioSessionMethodsSwift(contents) {
-    const audioSessionDidActivateMethod = 'RTCAudioSession.sharedInstance().audioSessionDidActivate(AVAudioSession.sharedInstance())';
-    if (!contents.includes(audioSessionDidActivateMethod)) {
-        const functionSelector = 'provider(_:didActivate:)';
-        if (!contents.includes('didActivateAudioSession')) {
-            contents = (0, codeMod_1.insertContentsInsideSwiftClassBlock)(contents, 'class AppDelegate', `
-  func provider(_ provider: CXProvider, didActivateAudioSession audioSession: AVAudioSession) {
-    ${audioSessionDidActivateMethod}
-  }
-    `, { position: 'tail' });
-        }
-        else {
-            contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, audioSessionDidActivateMethod, { position: 'tail' });
-        }
-    }
-    const audioSessionDidDeactivateMethod = 'RTCAudioSession.sharedInstance().audioSessionDidDeactivate(AVAudioSession.sharedInstance())';
-    if (!contents.includes(audioSessionDidDeactivateMethod)) {
-        const functionSelector = 'provider(_:didDeactivate:)';
-        if (!contents.includes('didDeactivateAudioSession')) {
-            contents = (0, codeMod_1.insertContentsInsideSwiftClassBlock)(contents, 'class AppDelegate', `
-  func provider(_ provider: CXProvider, didDeactivateAudioSession audioSession: AVAudioSession) {
-    ${audioSessionDidDeactivateMethod}
-  }
-    `, { position: 'tail' });
-        }
-        else {
-            contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, audioSessionDidDeactivateMethod, { position: 'tail' });
-        }
-    }
-    return contents;
-}
-function addAudioSessionMethodsObjc(contents) {
-    const audioSessionDidActivateMethod = '[[RTCAudioSession sharedInstance] audioSessionDidActivate:[AVAudioSession sharedInstance]];';
-    if (!contents.includes(audioSessionDidActivateMethod)) {
-        const functionSelector = 'provider:didActivateAudioSession:audioSession:';
-        const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
-        if (!codeblock) {
-            contents = (0, addNewLinesToAppDelegateObjc_1.default)(contents, [
-                '- (void) provider:(CXProvider *) provider didActivateAudioSession:(AVAudioSession *) audioSession {',
-                '  ' /* indentation */ + audioSessionDidActivateMethod,
-                '}',
-            ]);
-        }
-        else {
-            contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, audioSessionDidActivateMethod, { position: 'tail' });
-        }
-    }
-    const audioSessionDidDeactivateMethod = '[[RTCAudioSession sharedInstance] audioSessionDidDeactivate:[AVAudioSession sharedInstance]];';
-    if (!contents.includes(audioSessionDidDeactivateMethod)) {
-        const functionSelector = 'provider:didDeactivateAudioSession:audioSession:';
-        const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
-        if (!codeblock) {
-            contents = (0, addNewLinesToAppDelegateObjc_1.default)(contents, [
-                '- (void) provider:(CXProvider *) provider didDeactivateAudioSession:(AVAudioSession *) audioSession {',
-                '  ' /* indentation */ + audioSessionDidDeactivateMethod,
-                '}',
-            ]);
-        }
-        else {
-            contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, audioSessionDidDeactivateMethod, { position: 'tail' });
-        }
-    }
-    return contents;
-}
 function addDidReceiveIncomingPushCallbackSwift(contents) {
     const onIncomingPush = `
-    guard let stream = payload.dictionaryPayload["stream"] as? [String: Any],
-          let createdCallerName = stream["created_by_display_name"] as? String,
-          let cid = stream["call_cid"] as? String else {
-      completion()
-      return
-    }
-
-    // Check if user is busy BEFORE registering the call
-    let shouldReject = StreamVideoReactNative.shouldRejectCallWhenBusy()
-    let hasAnyActiveCall = StreamVideoReactNative.hasAnyActiveCall()
-        
-    if shouldReject && hasAnyActiveCall {
-        // Complete the VoIP notification without showing CallKit UI
-        completion()
-        return
-    }
-    
-    let uuid = UUID().uuidString
-    let videoIncluded = stream["video"] as? String
-    let hasVideo = videoIncluded == "false" ? false : true
-    
-    StreamVideoReactNative.registerIncomingCall(cid, uuid: uuid)
-    
-    RNVoipPushNotificationManager.addCompletionHandler(uuid, completionHandler: completion)
-    
-    RNVoipPushNotificationManager.didReceiveIncomingPush(with: payload, forType: type.rawValue)
-    
-    RNCallKeep.reportNewIncomingCall(uuid,
-                                     handle: createdCallerName,
-                                     handleType: "generic",
-                                     hasVideo: hasVideo,
-                                     localizedCallerName: createdCallerName,
-                                     supportsHolding: false,
-                                     supportsDTMF: false,
-                                     supportsGrouping: false,
-                                     supportsUngrouping: false,
-                                     fromPushKit: true,
-                                     payload: stream,
-                                     withCompletionHandler: nil)`;
-    if (!contents.includes('RNVoipPushNotificationManager.didReceiveIncomingPush')) {
+    StreamVideoReactNative.didReceiveIncomingPush(payload, forType: type.rawValue, completionHandler: completion)`;
+    if (!contents.includes('StreamVideoReactNative.didReceiveIncomingPush')) {
         const functionSelector = 'pushRegistry(_:didReceiveIncomingPushWith:for:completion:)';
         const codeblock = (0, codeMod_1.findSwiftFunctionCodeBlock)(contents, functionSelector);
         if (!codeblock) {
@@ -342,49 +203,10 @@ function addDidReceiveIncomingPushCallbackSwift(contents) {
 }
 function addDidReceiveIncomingPushCallbackObjc(contents) {
     const onIncomingPush = `
-  // process the payload and store it in the native module's cache
-  NSDictionary *stream = payload.dictionaryPayload[@"stream"];
-  NSString *uuid = [[NSUUID UUID] UUIDString];
-  NSString *createdCallerName = stream[@"created_by_display_name"];
-  NSString *cid = stream[@"call_cid"];
-  
-  // Check if user is busy BEFORE registering the call
-  BOOL shouldReject = [StreamVideoReactNative shouldRejectCallWhenBusy];
-  BOOL hasAnyActiveCall = [StreamVideoReactNative hasAnyActiveCall];
-  
-  if (shouldReject && hasAnyActiveCall) {
-      // Complete the VoIP notification without showing CallKit UI
-      completion();
-      return;
-  }
-  
-  NSString *videoIncluded = stream[@"video"];
-  BOOL hasVideo = [videoIncluded isEqualToString:@"false"] ? NO : YES;
-
-  // store the call cid and uuid in the native module's cache
-  [StreamVideoReactNative registerIncomingCall:cid uuid:uuid];
-
-  // set the completion handler - this one is called by the JS SDK
-  [RNVoipPushNotificationManager addCompletionHandler:uuid completionHandler:completion];
-
-  // send event to JS - the JS SDK will handle the rest and call the 'completionHandler'
-  [RNVoipPushNotificationManager didReceiveIncomingPushWithPayload:payload forType:(NSString *)type];
-
-  // display the incoming call notification
-  [RNCallKeep reportNewIncomingCall: uuid
-                             handle: createdCallerName
-                         handleType: @"generic"
-                           hasVideo: hasVideo
-                localizedCallerName: createdCallerName
-                    supportsHolding: NO
-                       supportsDTMF: NO
-                   supportsGrouping: NO
-                 supportsUngrouping: NO
-                        fromPushKit: YES
-                            payload: stream
-              withCompletionHandler: nil];
+  // process the payload and display the incoming call notification
+  [StreamVideoReactNative didReceiveIncomingPush:payload forType: (NSString *)type completionHandler:completion];
 `;
-    if (!contents.includes('[RNVoipPushNotificationManager didReceiveIncomingPushWithPayload')) {
+    if (!contents.includes('[StreamVideoReactNative didReceiveIncomingPush')) {
         const functionSelector = 'pushRegistry:didReceiveIncomingPushWithPayload:forType:withCompletionHandler:';
         const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
         if (!codeblock) {

package/expo-config-plugin/dist/withMainActivity.js

@@ -23,7 +23,7 @@ const withStreamVideoReactNativeSDKMainActivity = (configuration, props) => {
         if (props?.enableScreenshare) {
             config.modResults.contents = addInsideOnCreateScreenshare(config.modResults.contents, isMainActivityJava);
         }
-        if (props?.ringingPushNotifications?.showWhenLockedAndroid) {
+        if (props?.ringing) {
             config.modResults.contents = addInsideOnCreateLockscreen(config.modResults.contents, isMainActivityJava);
         }
         return config;

package/expo-config-plugin/dist/withiOSInfoPlist.js

@@ -12,7 +12,7 @@ const withStreamVideoReactNativeSDKiOSInfoPList = (configuration, props) => {
             }
         }
         addBackgroundMode('audio');
-        if (props?.ringingPushNotifications) {
+        if (props?.ringing) {
             addBackgroundMode('voip');
             addBackgroundMode('fetch');
             addBackgroundMode('processing');
@@ -20,8 +20,7 @@ const withStreamVideoReactNativeSDKiOSInfoPList = (configuration, props) => {
                 '$(PRODUCT_BUNDLE_IDENTIFIER)',
             ];
         }
-        if (props?.enableNonRingingPushNotifications ||
-            props?.ringingPushNotifications) {
+        if (props?.enableNonRingingPushNotifications || props?.ringing) {
             addBackgroundMode('remote-notification');
         }
         return config;

package/ios/StreamInCallManager.swift

@@ -132,6 +132,7 @@ class StreamInCallManager: RCTEventEmitter {
             rtcConfig.category = intendedCategory.rawValue
             rtcConfig.mode = intendedMode.rawValue
             rtcConfig.categoryOptions = intendedOptions
+            // This ensures WebRTC's internal state stays consistent during interruptions/route changes
             RTCAudioSessionConfiguration.setWebRTC(rtcConfig)
             
             let session = RTCAudioSession.sharedInstance()
@@ -141,6 +142,9 @@ class StreamInCallManager: RCTEventEmitter {
             }
             do {
                 try session.setCategory(intendedCategory, mode: intendedMode, options: intendedOptions)
+                // Apply sample rate and IO buffer duration from WebRTC's config
+                try session.setPreferredSampleRate(rtcConfig.sampleRate)
+                try session.setPreferredIOBufferDuration(rtcConfig.ioBufferDuration)
                 if (wasRecording) {
                     try adm.setRecording(wasRecording)
                 }

package/ios/StreamVideoReactNative.h

@@ -1,16 +1,19 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridge.h>
+#import <PushKit/PushKit.h>
 
 @interface StreamVideoReactNative : RCTEventEmitter <RCTBridgeModule>
 
 - (void)screenShareEventReceived:(NSString *)event;
 
-+ (void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid;
-
 + (void)setup DEPRECATED_MSG_ATTRIBUTE("No need to use setup() anymore");
 
-+ (BOOL)shouldRejectCallWhenBusy;
-
 + (BOOL)hasAnyActiveCall;
 
++ (void)voipRegistration;
+
++ (void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type;
+
++ (void)didReceiveIncomingPush:(PKPushPayload *)payload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion;
+
 @end

package/ios/StreamVideoReactNative.m

@@ -4,6 +4,7 @@
 #import <React/RCTUIManagerUtils.h>
 #import <UIKit/UIKit.h>
 #import <CallKit/CallKit.h>
+#import <PushKit/PushKit.h>
 #import "StreamVideoReactNative.h"
 #import "WebRTCModule.h"
 #import "WebRTCModuleOptions.h"
@@ -14,12 +15,8 @@
 NSNotificationName const kBroadcastStartedNotification = @"iOS_BroadcastStarted";
 NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped";
 
-static NSMutableDictionary *_incomingCallUUIDsByCallID = nil;
-static NSMutableDictionary *_incomingCallCidsByUUID = nil;
 static dispatch_queue_t _dictionaryQueue = nil;
 
-static BOOL _shouldRejectCallWhenBusy = NO;
-
 void broadcastNotificationCallback(CFNotificationCenterRef center,
                                    void *observer,
                                    CFStringRef name,
@@ -60,11 +57,198 @@ RCT_EXPORT_MODULE();
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         _dictionaryQueue = dispatch_queue_create("com.stream.video.dictionary", DISPATCH_QUEUE_SERIAL);
-        _incomingCallUUIDsByCallID = [NSMutableDictionary dictionary];
-        _incomingCallCidsByUUID = [NSMutableDictionary dictionary];
     });
 }
 
++(BOOL)canRegisterCall {
+    Class callingxClass = NSClassFromString(@"Callingx");
+    if (!callingxClass) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][canRegisterCall] Callingx not available");
+        #endif
+        return YES;
+    }
+    
+    SEL selector = @selector(canRegisterCall);
+    if (![callingxClass respondsToSelector:selector]) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][canRegisterCall] Callingx does not respond to canRegisterCall selector");
+        #endif
+        return YES;
+    }
+    
+    NSMethodSignature *signature = [callingxClass methodSignatureForSelector:selector];
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setTarget:callingxClass];
+    [invocation setSelector:selector];
+    [invocation invoke];
+    
+    BOOL canRegister = NO;
+    [invocation getReturnValue:&canRegister];
+    
+    #if DEBUG
+    NSLog(@"[StreamVideoReactNative][canRegisterCall] canRegisterCall = %@", canRegister ? @"YES" : @"NO");
+    #endif
+    
+    return canRegister;
+}
+
++(void)voipRegistration {
+    Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
+    if (!voipManagerClass) {
+        // Fallback: Try the unmangled name (might work depending on Swift version)
+        voipManagerClass = NSClassFromString(@"VoipNotificationsManager");
+    }
+    
+    if (!voipManagerClass) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][voipRegistration] VoipNotificationsManager not available");
+        #endif
+        return;
+    }
+    
+    SEL selector = @selector(voipRegistration);
+    if (![voipManagerClass respondsToSelector:selector]) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][voipRegistration] VoipNotificationsManager does not respond to voipRegistration");
+        #endif
+        return;
+    }
+    
+    [voipManagerClass voipRegistration];
+}
+
++(void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type {
+    Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
+    if (!voipManagerClass) {
+        // Fallback: Try the unmangled name (might work depending on Swift version)
+        voipManagerClass = NSClassFromString(@"VoipNotificationsManager");
+    }
+    
+    if (!voipManagerClass) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didUpdatePushCredentials] VoipNotificationsManager not available");
+        #endif
+        return;
+    }
+    
+    SEL selector = @selector(didUpdatePushCredentials:forType:);
+    if (![voipManagerClass respondsToSelector:selector]) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didUpdatePushCredentials] VoipNotificationsManager does not respond to didUpdatePushCredentials:forType:");
+        #endif
+        return;
+    }
+    
+    [voipManagerClass didUpdatePushCredentials:credentials forType:type];
+}
+
++(void)didReceiveIncomingPush:(PKPushPayload *)payload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion {
+    NSDictionary *streamPayload = payload.dictionaryPayload[@"stream"];
+    if (!streamPayload) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Stream payload not found");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+    
+    NSString *createdCallerName = streamPayload[@"created_by_display_name"];
+    NSString *callCid = streamPayload[@"call_cid"];
+    if (!createdCallerName || !callCid) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Missing required fields: created_by_display_name or call_cid");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+    
+    if (![StreamVideoReactNative canRegisterCall]) {
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    [StreamVideoReactNative reportNewIncomingCall:streamPayload forType:type completionHandler:completion];
+    [StreamVideoReactNative didReceiveIncomingPushWithPayload:payload forType:type];
+}
+
++(void)reportNewIncomingCall:(NSDictionary *)streamPayload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion {
+    Class callingxClass = NSClassFromString(@"Callingx");
+    if (!callingxClass) {
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Callingx not available");
+        return;
+    }
+    
+    SEL selector = @selector(reportNewIncomingCall:handle:handleType:hasVideo:localizedCallerName:supportsHolding:supportsDTMF:supportsGrouping:supportsUngrouping:fromPushKit:payload:withCompletionHandler:);
+    if (![callingxClass respondsToSelector:selector]) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Callingx does not respond to selector");
+        #endif
+        return;
+    }
+    
+    NSString *callCid = streamPayload[@"call_cid"];
+    NSString *createdCallerName = streamPayload[@"created_by_display_name"];
+    NSString *videoIncluded = streamPayload[@"video"];
+    BOOL hasVideo = [videoIncluded isEqualToString:@"false"] ? NO : YES;
+    NSString *handleType = @"generic";
+    BOOL supportsHolding = NO;
+    BOOL supportsDTMF = NO;
+    BOOL supportsGrouping = NO;
+    BOOL supportsUngrouping = NO;
+    BOOL fromPushKit = YES;
+    void (^completionHandler)(void) = completion;
+    
+    NSMethodSignature *signature = [callingxClass methodSignatureForSelector:selector];
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setTarget:callingxClass];
+    [invocation setSelector:selector];
+    [invocation setArgument:&callCid atIndex:2];
+    [invocation setArgument:&createdCallerName atIndex:3];
+    [invocation setArgument:&handleType atIndex:4];
+    [invocation setArgument:&hasVideo atIndex:5];
+    [invocation setArgument:&createdCallerName atIndex:6];
+    [invocation setArgument:&supportsHolding atIndex:7];
+    [invocation setArgument:&supportsDTMF atIndex:8];
+    [invocation setArgument:&supportsGrouping atIndex:9];
+    [invocation setArgument:&supportsUngrouping atIndex:10];
+    [invocation setArgument:&fromPushKit atIndex:11];
+    [invocation setArgument:&streamPayload atIndex:12];
+    [invocation setArgument:&completionHandler atIndex:13];
+    [invocation invoke];
+}
+
++(void)didReceiveIncomingPushWithPayload:(PKPushPayload *)payload forType:(NSString *)type {
+    Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
+    if (!voipManagerClass) {
+        // Fallback: Try the unmangled name (might work depending on Swift version)
+        voipManagerClass = NSClassFromString(@"VoipNotificationsManager");
+    }
+    
+    if (!voipManagerClass) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPushWithPayload] VoipNotificationsManager not available");
+        #endif
+        return;
+    }
+    
+    SEL selector = @selector(didReceiveIncomingPushWithPayload:forType:);
+    if (![voipManagerClass respondsToSelector:selector]) {
+        #if DEBUG
+        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPushWithPayload] VoipNotificationsManager does not respond to didReceiveIncomingPushWithPayload:forType:");
+        #endif
+        return;
+    }
+    
+    [voipManagerClass didReceiveIncomingPushWithPayload:payload forType:type];
+}
+
 -(instancetype)init {
     if ((self = [super init])) {
         _notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
@@ -191,71 +375,6 @@ RCT_EXPORT_METHOD(currentThermalState:(RCTPromiseResolveBlock)resolve rejecter:(
     }
 }
 
-+(void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid {
-    [StreamVideoReactNative initializeSharedDictionaries];
-    dispatch_sync(_dictionaryQueue, ^{
-        
-#ifdef DEBUG
-        NSLog(@"registerIncomingCall cid:%@ -> uuid:%@",cid,uuid);
-#endif
-        NSString *lowercaseUUID = [uuid lowercaseString];
-        _incomingCallUUIDsByCallID[cid] = lowercaseUUID;
-        _incomingCallCidsByUUID[lowercaseUUID] = cid;
-    });
-}
-
-RCT_EXPORT_METHOD(getIncomingCallUUid:(NSString *)cid
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    dispatch_sync(_dictionaryQueue, ^{
-        NSString *uuid = _incomingCallUUIDsByCallID[cid];
-        if (uuid) {
-            resolve(uuid);
-        } else {
-            NSString *errorString = [NSString stringWithFormat:@"requested incoming call not found for cid: %@", cid];
-            reject(@"access_failure", errorString, nil);
-        }
-    });
-}
-
-RCT_EXPORT_METHOD(getIncomingCallCid:(NSString *)uuid
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    dispatch_sync(_dictionaryQueue, ^{
-        NSString *lowercaseUUID = [uuid lowercaseString];
-        NSString *foundCid = _incomingCallCidsByUUID[lowercaseUUID];
-        
-        if (foundCid) {
-            resolve(foundCid);
-        } else {
-            NSString *errorString = [NSString stringWithFormat:@"requested incoming call not found for uuid: %@", uuid];
-            reject(@"access_failure", errorString, nil);
-        }
-    });
-}
-
-RCT_EXPORT_METHOD(removeIncomingCall:(NSString *)cid
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    dispatch_sync(_dictionaryQueue, ^{
-        NSString *uuid = _incomingCallUUIDsByCallID[cid];
-        if (uuid) {
-#ifdef DEBUG
-            NSLog(@"removeIncomingCall cid:%@ -> uuid:%@",cid,uuid);
-#endif
-            
-            [_incomingCallUUIDsByCallID removeObjectForKey:cid];
-            [_incomingCallCidsByUUID removeObjectForKey:uuid];
-            resolve(@YES);
-        } else {
-            resolve(@NO);
-        }
-    });
-}
-
 RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)reactTag
                   options:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
@@ -373,17 +492,7 @@ RCT_EXPORT_METHOD(getBatteryState:(RCTPromiseResolveBlock)resolve
     ];
 }
 
-+(BOOL)shouldRejectCallWhenBusy {
-    return _shouldRejectCallWhenBusy;
-}
-
-RCT_EXPORT_METHOD(setShouldRejectCallWhenBusy:(BOOL)shouldReject) {
-    _shouldRejectCallWhenBusy = shouldReject;
-#ifdef DEBUG
-    NSLog(@"setShouldRejectCallWhenBusy: %@", shouldReject ? @"YES" : @"NO");
-#endif
-}
-
+//current implementation will return any registered calls not only stream calls
 + (BOOL)hasAnyActiveCall
 {
     CXCallObserver *callObserver = [[CXCallObserver alloc] init];