@stream-io/react-native-callingx 0.3.1 → 0.4.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.4.0](https://github.com/GetStream/stream-video-js/compare/@stream-io/react-native-callingx-0.3.1...@stream-io/react-native-callingx-0.4.0) (2026-06-04)
+
+### Features
+
+- added self managed push kit delegate management ([#2263](https://github.com/GetStream/stream-video-js/issues/2263)) ([ede4671](https://github.com/GetStream/stream-video-js/commit/ede467138a4727ccdc5cf3702b16747c516775a5))
+
+### Bug Fixes
+
+- skip notification bg->fg transition case ([#2262](https://github.com/GetStream/stream-video-js/issues/2262)) ([e5cd46f](https://github.com/GetStream/stream-video-js/commit/e5cd46fa557d83f3de1c983d1aca2adfac9ad0ee))
+
 ## [0.3.1](https://github.com/GetStream/stream-video-js/compare/@stream-io/react-native-callingx-0.3.0...@stream-io/react-native-callingx-0.3.1) (2026-05-26)
 
 ### Bug Fixes

package/Callingx.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/GetStream/stream-video-js/tree/main/packages/react-native-callingx.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.public_header_files = "ios/CallingxPublic.h"
+  s.public_header_files = "ios/CallingxPublic.h", "ios/VoipPushHandler.h"
   s.swift_version = "5.0"
 
   s.dependency "stream-react-native-webrtc"

package/android/src/main/java/io/getstream/rn/callingx/notifications/CallNotificationManager.kt

@@ -20,6 +20,7 @@ import io.getstream.rn.callingx.debugLog
 import io.getstream.rn.callingx.getDisconnectCauseString
 import io.getstream.rn.callingx.model.Call
 import io.getstream.rn.callingx.repo.CallRepository
+import io.getstream.rn.callingx.utils.LifecycleListener
 import io.getstream.rn.callingx.utils.SettingsStore
 import androidx.core.graphics.toColorInt
 
@@ -303,8 +304,24 @@ class CallNotificationManager(
         notificationsState[callId] = current.copy(optimisticState = OptimisticState.NONE, lastSnapshot = null)
     }
 
+    // when skipIncomingPushInForeground is true, we use the ongoing channel 
+    // for the notification to avoid notification overlapping app ui, just for UX purposes
+    private fun shouldShowAsIncoming(
+            call: Call.Registered,
+            optimisticState: OptimisticState
+    ): Boolean {
+        val isIncoming =
+                call.isIncoming() && !call.isActive && optimisticState == OptimisticState.NONE
+        if (!isIncoming) return false
+
+        val skipInForeground =
+                SettingsStore.shouldSkipIncomingPushInForeground(context) &&
+                        LifecycleListener.isInForeground
+        return !skipInForeground
+    }
+
     private fun getChannelId(call: Call.Registered, optimisticState: OptimisticState): String {
-        return if (call.isIncoming() && !call.isActive && optimisticState == OptimisticState.NONE) {
+        return if (shouldShowAsIncoming(call, optimisticState)) {
             notificationsConfig.incomingChannel.id
         } else {
             notificationsConfig.ongoingChannel.id

package/ios/Callingx.mm

@@ -38,6 +38,8 @@
   CallingxImpl *_moduleImpl;
 }
 
+@synthesize moduleRegistry = _moduleRegistry;
+
 #pragma mark - Singleton
 
 + (id)allocWithZone:(NSZone *)zone {
@@ -161,10 +163,10 @@ RCT_EXPORT_MODULE(Callingx)
 - (void)_setupiOSWithOptions:(NSDictionary *)optionsDict {
   [_moduleImpl setupWithOptions:optionsDict];
 
-  // Inject WebRTCModule so CallingxImpl can access AudioDeviceModule.
-  // self.bridge is NOT available on TurboModules — use currentBridge instead,
-  // which returns the real RCTBridge or RCTBridgeProxy (bridgeless interop).
-  WebRTCModule *webrtcModule = [[RCTBridge currentBridge] moduleForName:@"WebRTCModule"];
+  // Resolve WebRTCModule via the injected RCTModuleRegistry so CallingxImpl can
+  // access its AudioDeviceModule. Works on both old and new arch, including
+  // bridgeless (where [RCTBridge currentBridge] is a stub that returns nil).
+  WebRTCModule *webrtcModule = [self.moduleRegistry moduleForName:"WebRTCModule"];
   _moduleImpl.webRTCModule = webrtcModule;
 
   self.callKeepCallController = _moduleImpl.callKeepCallController;

package/ios/VoipNotificationsManager.swift

@@ -20,7 +20,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
     private static var isVoipRegistered = false
     private static var lastVoipToken = ""
     private static var voipRegistry: PKPushRegistry?
-    
+
     private var canSendEvents: Bool = false
     private var delayedEvents: [[String:Any]] = []
     
@@ -60,28 +60,19 @@ typealias RNVoipPushNotificationCompletion = () -> Void
             #endif
             let voipPushManager = VoipNotificationsManager.shared()
             voipPushManager.sendEventWithNameWrapper(name: VoipNotificationsEvents.registered, body: ["token": lastVoipToken])
-        } else {
-            #if DEBUG
-            NSLog("%@","[VoipNotificationsManager] voipRegistration enter")
-            #endif
-            DispatchQueue.main.async {
-                let voipRegistry = PKPushRegistry(queue: DispatchQueue.main)
-                // Set the registry's delegate to AppDelegate
-                // Note: The original code casts the delegate, but this should be handled by AppDelegate
-                if let appDelegate = RCTSharedApplication()?.delegate as? PKPushRegistryDelegate {
-                    voipRegistry.delegate = appDelegate
-                    // Set the push type to VoIP
-                    // Store the registry to prevent deallocation
-                    voipRegistry.desiredPushTypes = [.voIP]
-                    VoipNotificationsManager.voipRegistry = voipRegistry
-                    
-                    isVoipRegistered = true
-                } else {
-                    #if DEBUG
-                    NSLog("%@","[VoipNotificationsManager] voipRegistration appDelegate not found. return")
-                    #endif
-                }
-            }
+            return
+        }
+
+        #if DEBUG
+        NSLog("%@","[VoipNotificationsManager] voipRegistration enter")
+        #endif
+
+        DispatchQueue.main.async {
+            let registry = PKPushRegistry(queue: DispatchQueue.main)
+            registry.delegate = VoipPushHandler.sharedInstance()
+            registry.desiredPushTypes = [.voIP]
+            VoipNotificationsManager.voipRegistry = registry
+            isVoipRegistered = true
         }
     }
     

package/ios/VoipPushHandler.h

@@ -0,0 +1,29 @@
+#import <Foundation/Foundation.h>
+#import <PushKit/PushKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VoipPushHandler : NSObject <PKPushRegistryDelegate>
+
++ (instancetype)sharedInstance;
+
+/** Handles a legacy `pushRegistry:didReceiveIncomingPushWithPayload:forType:withCompletionHandler:` callback. */
++ (void)handleIncomingPush:(PKPushPayload *)payload
+                   forType:(NSString *)type
+         completionHandler:(void (^_Nullable)(void))completion;
+
+/**
+ * Handles an iOS 26.4+ `pushRegistry:didReceiveIncomingVoIPPushWithPayload:metadata:withCompletionHandler:`
+ * callback. Gated behind `__IPHONE_26_4` because `PKVoIPPushMetadata` only
+ * exists in the iOS 26.4 SDK; on older Xcode this declaration is omitted and
+ * PushKit dispatches to the legacy `handleIncomingPush:forType:` path instead.
+ */
+#ifdef __IPHONE_26_4
++ (void)handleIncomingVoIPPush:(PKPushPayload *)payload
+                      metadata:(PKVoIPPushMetadata * _Nullable)metadata
+             completionHandler:(void (^_Nullable)(void))completion API_AVAILABLE(ios(26.4));
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/VoipPushHandler.m

@@ -0,0 +1,203 @@
+#import "VoipPushHandler.h"
+#import "CallingxPublic.h"
+#import <UIKit/UIKit.h>
+
+// Import Swift generated header for VoipNotificationsManager
+#if __has_include("Callingx-Swift.h")
+#import "Callingx-Swift.h"
+#else
+#import <Callingx/Callingx-Swift.h>
+#endif
+
+static NSString *const DEFAULT_DISPLAY_NAME = @"Unknown Caller";
+
+@interface Callingx (VoipPushHandlerInternal)
++ (BOOL)shouldSkipIncomingPushInForeground;
+@end
+
+#pragma mark - Helpers
+
+// applicationState must be read on the main thread (PushKit delivers on
+// main, so the common path skips dispatch). Treat Inactive as foreground:
+// covers brief transitions and system overlays.
+static BOOL isAppInForeground(void) {
+    __block UIApplicationState state = UIApplicationStateActive;
+    void (^readState)(void) = ^{
+        state = [UIApplication sharedApplication].applicationState;
+    };
+    if ([NSThread isMainThread]) {
+        readState();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), readState);
+    }
+    return state != UIApplicationStateBackground;
+}
+
+// Extracts CallKit-display fields from the Stream payload and reports the
+// incoming call via Callingx.
+static void reportIncomingCallFromStreamPayload(NSDictionary *streamPayload,
+                                                void (^_Nullable completion)(void)) {
+    NSString *callCid = streamPayload[@"call_cid"];
+    NSString *callDisplayName = streamPayload[@"call_display_name"];
+    NSString *createdByDisplayName = streamPayload[@"created_by_display_name"];
+    NSString *createdCallerName = callDisplayName.length > 0 ? callDisplayName : createdByDisplayName;
+    NSString *localizedCallerName = createdCallerName.length > 0 ? createdCallerName : DEFAULT_DISPLAY_NAME;
+    NSString *createdById = streamPayload[@"created_by_id"];
+    NSString *handle = createdById.length > 0 ? createdById : localizedCallerName;
+    NSString *videoIncluded = streamPayload[@"video"];
+    BOOL hasVideo = [videoIncluded isEqualToString:@"false"] ? NO : YES;
+
+    [Callingx reportNewIncomingCall:callCid
+                             handle:handle
+                         handleType:@"generic"
+                           hasVideo:hasVideo
+                localizedCallerName:localizedCallerName
+                    supportsHolding:NO
+                       supportsDTMF:NO
+                   supportsGrouping:NO
+                 supportsUngrouping:NO
+                            payload:streamPayload
+              withCompletionHandler:completion];
+}
+
+#pragma mark - Implementation
+
+@implementation VoipPushHandler
+
++ (instancetype)sharedInstance {
+    static VoipPushHandler *instance;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[self alloc] init];
+    });
+    return instance;
+}
+
+#pragma mark - Static orchestration
+
++ (void)handleIncomingPush:(PKPushPayload *)payload
+                   forType:(NSString *)type
+         completionHandler:(void (^_Nullable)(void))completion {
+    NSDictionary *streamPayload = payload.dictionaryPayload[@"stream"];
+    if (!streamPayload) {
+        #if DEBUG
+        NSLog(@"[VoipPushHandler][handleIncomingPush] Stream payload not found");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    NSString *callCid = streamPayload[@"call_cid"];
+    if (!callCid) {
+        #if DEBUG
+        NSLog(@"[VoipPushHandler][handleIncomingPush] Missing required field: call_cid");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    if (![Callingx canRegisterCall]) {
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    reportIncomingCallFromStreamPayload(streamPayload, completion);
+    [VoipNotificationsManager didReceiveIncomingPushWithPayload:payload forType:type];
+}
+
+#pragma mark - PKPushRegistryDelegate (managed mode)
+
+- (void)pushRegistry:(PKPushRegistry *)registry
+   didUpdatePushCredentials:(PKPushCredentials *)credentials
+                    forType:(PKPushType)type {
+    [VoipNotificationsManager didUpdatePushCredentials:credentials forType:(NSString *)type];
+}
+
+- (void)pushRegistry:(PKPushRegistry *)registry
+   didReceiveIncomingPushWithPayload:(PKPushPayload *)payload
+                             forType:(PKPushType)type
+               withCompletionHandler:(void (^)(void))completion {
+    [VoipPushHandler handleIncomingPush:payload
+                                forType:(NSString *)type
+                      completionHandler:completion];
+    NSLog(@"[VoipPushHandler][pushRegistry:didReceiveIncomingPushWithPayload:forType:withCompletionHandler:] completion");
+}
+
+#ifdef __IPHONE_26_4
++ (void)handleIncomingVoIPPush:(PKPushPayload *)payload
+                      metadata:(PKVoIPPushMetadata * _Nullable)metadata
+             completionHandler:(void (^_Nullable)(void))completion {
+    NSDictionary *streamPayload = payload.dictionaryPayload[@"stream"];
+    if (!streamPayload) {
+        #if DEBUG
+        NSLog(@"[VoipPushHandler][handleIncomingVoIPPush] Stream payload not found");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    NSString *callCid = streamPayload[@"call_cid"];
+    if (!callCid) {
+        #if DEBUG
+        NSLog(@"[VoipPushHandler][handleIncomingVoIPPush] Missing required field: call_cid");
+        #endif
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    NSString *type = @"PKPushTypeVoIP";
+    BOOL mustReport = metadata ? metadata.mustReport : YES;
+
+    // Both skip paths require mustReport == NO; skipping while YES risks
+    // PushKit terminating the app.
+    if (!mustReport && ![Callingx canRegisterCall]) {
+        // Busy reject: drop without forwarding to JS.
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    if (!mustReport &&
+        [Callingx shouldSkipIncomingPushInForeground] &&
+        isAppInForeground()) {
+        // Foreground skip: hide CallKit, let JS render the ringing UI.
+        [VoipNotificationsManager didReceiveIncomingPushWithPayload:payload forType:type];
+        if (completion) {
+            completion();
+        }
+        return;
+    }
+
+    reportIncomingCallFromStreamPayload(streamPayload, completion);
+    [VoipNotificationsManager didReceiveIncomingPushWithPayload:payload forType:type];
+}
+
+// iOS 26.4 added a new VoIP push selector that carries a `PKVoIPPushMetadata`
+// argument (notably `mustReport`). The type only exists in the iOS 26.4 SDK,
+// so the `#ifdef __IPHONE_26_4` gate ensures this file still compiles on
+// older Xcode versions — older Xcode simply doesn't emit this method, and
+// PushKit on those builds dispatches to the legacy selector above.
+- (void)pushRegistry:(PKPushRegistry *)registry
+   didReceiveIncomingVoIPPushWithPayload:(PKPushPayload *)payload
+                                metadata:(PKVoIPPushMetadata *)metadata
+                   withCompletionHandler:(void (^)(void))completion
+                                                                API_AVAILABLE(ios(26.4)) {
+    [VoipPushHandler handleIncomingVoIPPush:payload
+                                   metadata:metadata
+                          completionHandler:completion];
+    NSLog(@"[VoipPushHandler][pushRegistry:didReceiveIncomingVoIPPushWithPayload:metadata:withCompletionHandler:] completion");
+}
+#endif
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/react-native-callingx",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "CallKit and Telecom API capabilities for React Native",
   "main": "./dist/module/index.js",
   "module": "./dist/module/index.js",
@@ -59,15 +59,15 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@react-native-community/cli": "20.0.1",
-    "@react-native/babel-preset": "0.81.5",
+    "@react-native-community/cli": "20.1.3",
+    "@react-native/babel-preset": "0.85.3",
     "@stream-io/react-native-webrtc": "137.2.0",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.2.15",
     "del-cli": "^6.0.0",
-    "react": "19.1.0",
-    "react-native": "0.81.5",
-    "react-native-builder-bob": "^0.40.15",
-    "typescript": "^5.9.2"
+    "react": "19.2.3",
+    "react-native": "0.85.3",
+    "react-native-builder-bob": "^0.41.0",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@react-native-firebase/app": ">=23.0.0",