@stream-io/video-react-native-sdk 1.44.0 → 2.0.0-beta.0

package/dist/typescript/utils/push/libs/firebaseMessaging/index.d.ts

@@ -1,5 +1,7 @@
-import { type Type } from './lib';
-export type { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
-export type FirebaseMessagingType = Type;
-export declare function getFirebaseMessagingLib(): FirebaseMessagingType;
+import { type MessagingModule } from './lib';
+export type FirebaseRemoteMessage = NonNullable<Awaited<ReturnType<MessagingModule['getInitialNotification']>>>;
+export declare function getFirebaseMessagingLib(): () => {
+    getToken: () => Promise<string>;
+    onTokenRefresh: (listener: (token: string) => void) => () => void;
+};
 //# sourceMappingURL=index.d.ts.map

package/dist/typescript/utils/push/libs/firebaseMessaging/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/push/libs/firebaseMessaging/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAEvC,YAAY,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAKzC,wBAAgB,uBAAuB,IAAI,qBAAqB,CAQ/D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/push/libs/firebaseMessaging/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,eAAe,EAAE,MAAM,OAAO,CAAC;AAKlD,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAC7C,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAC/D,CAAC;AAYF,wBAAgB,uBAAuB;;+BAKR,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI;EAGrD"}

package/dist/typescript/utils/push/libs/firebaseMessaging/lib.d.ts

@@ -1,4 +1,4 @@
-export type Type = typeof import('@react-native-firebase/messaging').default;
-declare let lib: Type | undefined;
+export type MessagingModule = typeof import('@react-native-firebase/messaging');
+declare let lib: MessagingModule | undefined;
 export { lib };
 //# sourceMappingURL=lib.d.ts.map

package/dist/typescript/utils/push/libs/firebaseMessaging/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/push/libs/firebaseMessaging/lib.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,cAAc,kCAAkC,EAAE,OAAO,CAAC;AAE7E,QAAA,IAAI,GAAG,EAAE,IAAI,GAAG,SAAS,CAAC;AAM1B,OAAO,EAAE,GAAG,EAAE,CAAC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/push/libs/firebaseMessaging/lib.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,cAAc,kCAAkC,CAAC,CAAC;AAEhF,QAAA,IAAI,GAAG,EAAE,eAAe,GAAG,SAAS,CAAC;AAMrC,OAAO,EAAE,GAAG,EAAE,CAAC"}

package/dist/typescript/utils/push/setupAndroidPushEvents.d.ts

@@ -0,0 +1,3 @@
+import { StreamVideoConfig } from '../StreamVideoRN/types';
+export declare function setupAndroidPushEvents(pushConfig: NonNullable<StreamVideoConfig['push']>): void;
+//# sourceMappingURL=setupAndroidPushEvents.d.ts.map

package/dist/typescript/utils/push/setupAndroidPushEvents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupAndroidPushEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupAndroidPushEvents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAiBnD"}

package/dist/typescript/utils/push/setupCallingExpEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupCallingExpEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupCallingExpEvents.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAYhE,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAIzD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,QAsDxE"}
+{"version":3,"file":"setupCallingExpEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupCallingExpEvents.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAahE,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAIzD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,QAyDxE"}

package/dist/typescript/utils/push/setupIosVoipPushEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupIosVoipPushEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupIosVoipPushEvents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAkBnD"}
+{"version":3,"file":"setupIosVoipPushEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupIosVoipPushEvents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAmBnD"}

package/dist/typescript/utils/push/utils.d.ts

@@ -1,9 +1,9 @@
-import type { FirebaseMessagingTypes } from './libs/firebaseMessaging';
+import type { FirebaseRemoteMessage } from './libs/firebaseMessaging';
 import type { NonRingingPushEvent } from '../StreamVideoRN/types';
 export type StreamPushPayload = {
     call_cid: string;
     type: 'call.ring' | NonRingingPushEvent;
     sender: string;
 } | undefined;
-export declare function isFirebaseStreamVideoMessage(message: FirebaseMessagingTypes.RemoteMessage): boolean;
+export declare function isFirebaseStreamVideoMessage(message: FirebaseRemoteMessage): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/typescript/utils/push/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAElE,MAAM,MAAM,iBAAiB,GACzB;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD,SAAS,CAAC;AAEd,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,sBAAsB,CAAC,aAAa,WAG9C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAElE,MAAM,MAAM,iBAAiB,GACzB;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD,SAAS,CAAC;AAEd,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,qBAAqB,WAE1E"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.44.0";
+export declare const version = "2.0.0-beta.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/typescript/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,iBAAiB,CAAC"}

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

@@ -15,7 +15,7 @@ const withStreamVideoReactNativeSDKAndroidPermissions = (configuration, props) =
         }
     }
     if (props?.androidKeepCallAlive) {
-        permissions.push('android.permission.FOREGROUND_SERVICE_CAMERA', 'android.permission.FOREGROUND_SERVICE_MICROPHONE', 'android.permission.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK');
+        permissions.push('android.permission.FOREGROUND_SERVICE_CAMERA', 'android.permission.FOREGROUND_SERVICE_MICROPHONE', 'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK');
     }
     const config = config_plugins_1.AndroidConfig.Permissions.withPermissions(configuration, permissions);
     return config;

package/ios/TracksRecorder/RecorderVideoSink.swift

@@ -12,11 +12,21 @@ import WebRTC
 ///
 /// Each delivered `RTCVideoFrame` is normalised to a CVPixelBuffer in the
 /// hardware H.264 encoder's native format — **NV12**
-/// (`kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange`).
-/// `RTCCVPixelBuffer` sources (camera passthrough) are forwarded with
-/// the underlying pixel buffer unchanged. `RTCI420Buffer` and other YUV
-/// sources are converted into a fresh IOSurface-backed NV12 buffer via
-/// a plane reorder (no color-space conversion required).
+/// (`kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange`). One branch per
+/// buffer type `renderFrame` can be handed:
+///
+/// - `RTCCVPixelBuffer` (camera passthrough) already wraps a CVPixelBuffer,
+///   so the underlying buffer is forwarded unchanged.
+/// - `RTCNV12Buffer` already holds NV12 planes, but as raw pointers rather
+///   than a CVPixelBuffer, so the planes are copied row-wise into a fresh
+///   one. No format conversion. This is the buffer type decoded remote
+///   frames arrive as, so it is the hot path for loopback recording — do
+///   not remove it. Without it these frames fall through to `toI420()`
+///   below, which converts NV12 → I420 → NV12 and caps throughput at
+///   roughly half the source frame rate.
+/// - `RTCI420Buffer` (and anything else, via `toI420()`) is converted into
+///   a fresh IOSurface-backed NV12 buffer by interleaving the U and V
+///   planes — a plane reorder, no colour-space conversion.
 ///
 /// **Why NV12 and not BGRA?** AVAssetWriter's hardware encoder accepts
 /// both, but BGRA requires an internal colour-space conversion that
@@ -51,6 +61,8 @@ import WebRTC
         if let cvBuffer = frame.buffer as? RTCCVPixelBuffer {
             // Camera passthrough — already a CVPixelBuffer (typically NV12 on iOS).
             pixelBuffer = cvBuffer.pixelBuffer
+        } else if let nv12 = frame.buffer as? RTCNV12Buffer {
+            pixelBuffer = Self.makeNV12PixelBuffer(fromNV12: nv12)
         } else if let i420 = frame.buffer as? RTCI420Buffer {
             pixelBuffer = Self.makeNV12PixelBuffer(fromI420: i420)
         } else {
@@ -67,6 +79,81 @@ import WebRTC
         frameHandler(outputBuffer, frame.width, frame.height, frame.timeStampNs)
     }
 
+    private static func makeNV12PixelBuffer(fromNV12 nv12: RTCNV12Buffer) -> CVPixelBuffer? {
+        let width = Int(nv12.width)
+        let height = Int(nv12.height)
+        let chromaWidth = Int(nv12.chromaWidth)
+        let chromaHeight = Int(nv12.chromaHeight)
+
+        guard let buffer = makePixelBuffer(width: width, height: height) else { return nil }
+
+        CVPixelBufferLockBaseAddress(buffer, [])
+        defer { CVPixelBufferUnlockBaseAddress(buffer, []) }
+
+        guard let yDest = CVPixelBufferGetBaseAddressOfPlane(buffer, 0) else { return nil }
+        copyPlane(
+            source: UnsafeRawPointer(nv12.dataY),
+            sourceStride: Int(nv12.strideY),
+            destination: yDest,
+            destinationStride: CVPixelBufferGetBytesPerRowOfPlane(buffer, 0),
+            rowBytes: width,
+            rows: height
+        )
+
+        // Plane 1: UV — already interleaved, so two bytes per chroma sample.
+        guard let uvDest = CVPixelBufferGetBaseAddressOfPlane(buffer, 1) else { return nil }
+        copyPlane(
+            source: UnsafeRawPointer(nv12.dataUV),
+            sourceStride: Int(nv12.strideUV),
+            destination: uvDest,
+            destinationStride: CVPixelBufferGetBytesPerRowOfPlane(buffer, 1),
+            rowBytes: chromaWidth * 2,
+            rows: chromaHeight
+        )
+
+        return buffer
+    }
+
+    private static func makePixelBuffer(width: Int, height: Int) -> CVPixelBuffer? {
+        var pixelBuffer: CVPixelBuffer?
+        let attrs: [String: Any] = [
+            kCVPixelBufferIOSurfacePropertiesKey as String: [:] as [String: Any],
+        ]
+        let status = CVPixelBufferCreate(
+            kCFAllocatorDefault,
+            width,
+            height,
+            kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
+            attrs as CFDictionary,
+            &pixelBuffer
+        )
+        guard status == kCVReturnSuccess else { return nil }
+        return pixelBuffer
+    }
+
+    /// Row-wise copy, collapsing to a single `memcpy` when the strides match.
+    private static func copyPlane(
+        source: UnsafeRawPointer,
+        sourceStride: Int,
+        destination: UnsafeMutableRawPointer,
+        destinationStride: Int,
+        rowBytes: Int,
+        rows: Int
+    ) {
+        if sourceStride == destinationStride && sourceStride == rowBytes {
+            memcpy(destination, source, rowBytes * rows)
+            return
+        }
+        let copyBytes = min(rowBytes, min(sourceStride, destinationStride))
+        for row in 0..<rows {
+            memcpy(
+                destination.advanced(by: row * destinationStride),
+                source.advanced(by: row * sourceStride),
+                copyBytes
+            )
+        }
+    }
+
     // MARK: - I420 → NV12
 
     /// Allocates a fresh IOSurface-backed NV12 `CVPixelBuffer` and copies

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "1.44.0",
+  "version": "2.0.0-beta.0",
   "description": "Stream Video SDK for React Native",
   "author": "https://getstream.io",
   "homepage": "https://getstream.io/video/docs/react-native/",
@@ -52,8 +52,8 @@
     "!**/.*"
   ],
   "dependencies": {
-    "@stream-io/video-client": "1.58.0",
-    "@stream-io/video-react-bindings": "1.20.0",
+    "@stream-io/video-client": "2.0.0-beta.0",
+    "@stream-io/video-react-bindings": "2.0.0-beta.0",
     "intl-pluralrules": "2.0.1",
     "react-native-url-polyfill": "^3.0.0",
     "rxjs": "~7.8.2",
@@ -118,7 +118,7 @@
     "@react-native/jest-preset": "0.86.2",
     "@react-native/metro-config": "0.86.2",
     "@stream-io/noise-cancellation-react-native": "^0.11.0",
-    "@stream-io/react-native-callingx": "^0.10.0",
+    "@stream-io/react-native-callingx": "^0.11.1",
     "@stream-io/react-native-webrtc": "145.3.1",
     "@stream-io/typescript-config": "^0.0.0",
     "@stream-io/video-filters-react-native": "^0.16.0",

package/src/hooks/push/useCallingExpWithCallingStateEffect.ts

@@ -17,7 +17,7 @@ export const useCallingExpWithCallingStateEffect = () => {
     useCallStateHooks();
 
   const activeCall = useCall();
-  const { isMute, microphone } = useMicrophoneState();
+  const { optimisticStatus, microphone } = useMicrophoneState();
   const callMembers = useCallMembers();
   const participants = useParticipants();
 
@@ -30,7 +30,7 @@ export const useCallingExpWithCallingStateEffect = () => {
 
   const callDisplayName = useMemo(
     () =>
-      callCustomDisplayName ??
+      callCustomDisplayName ||
       getCallDisplayName(callMembers, participants, currentUserId),
     [callMembers, participants, currentUserId, callCustomDisplayName],
   );
@@ -112,12 +112,19 @@ export const useCallingExpWithCallingStateEffect = () => {
       return;
     }
 
-    callingx.updateDisplay(
-      activeCallCid,
-      createdByUserId ?? callDisplayName,
-      callDisplayName,
-      isIncoming,
-    );
+    callingx
+      .updateDisplay(
+        activeCallCid,
+        createdByUserId ?? callDisplayName,
+        callDisplayName,
+        isIncoming,
+      )
+      .catch((error: unknown) => {
+        logger.debug(
+          `useCallingExpWithCallingStateEffect: Error updating display in callingx: ${activeCallCid}`,
+          error,
+        );
+      });
   }, [activeCallCid, createdByUserId, callDisplayName, isIncoming]);
 
   // Sync microphone mute state from app → CallKit
@@ -135,8 +142,14 @@ export const useCallingExpWithCallingStateEffect = () => {
       return;
     }
 
-    callingx.setMutedCall(activeCallCid, isMute);
-  }, [activeCallCid, isMute]);
+    if (optimisticStatus === undefined) {
+      logger.debug(
+        `useCallingExpWithCallingStateEffect: mic status is not resolved yet, skipping mute sync for: ${activeCallCid}`,
+      );
+      return;
+    }
+    callingx.setMutedCall(activeCallCid, optimisticStatus === 'disabled');
+  }, [activeCallCid, optimisticStatus]);
 
   // Sync mute state from CallKit → app (only for system-initiated mute actions)
   useEffect(() => {
@@ -165,7 +178,8 @@ export const useCallingExpWithCallingStateEffect = () => {
           return;
         }
 
-        const isCurrentlyMuted = microphone.state.status === 'disabled';
+        const isCurrentlyMuted =
+          microphone.state.optimisticStatus === 'disabled';
         if (isCurrentlyMuted === muted) {
           logger.debug(
             `useCallingExpWithCallingStateEffect: Mic toggle is already in the desired state: ${muted} for call: ${activeCallCid}`,

package/src/hooks/useAndroidKeepCallAliveEffect.ts

@@ -9,7 +9,10 @@ import {
   Platform,
 } from 'react-native';
 import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
-import { keepCallAliveCallRef } from '../utils/keepCallAliveHeadlessTask';
+import {
+  endKeepCallAliveHeadlessTask,
+  keepCallAliveCallRef,
+} from '../utils/keepCallAliveHeadlessTask';
 import { getCallingxLibIfAvailable } from '../utils/push/libs';
 
 async function stopForegroundServiceNoThrow() {
@@ -21,7 +24,10 @@ async function stopForegroundServiceNoThrow() {
   }
 }
 
-async function startForegroundService(call_cid: string) {
+/**
+ * @returns true when the native foreground service was asked to start.
+ */
+async function startForegroundService(call_cid: string): Promise<boolean> {
   const logger = videoLoggerSystem.getLogger('startForegroundService');
   const isCallAliveConfigured = await (async () => {
     try {
@@ -32,10 +38,14 @@ async function startForegroundService(call_cid: string) {
     }
   })();
   if (!isCallAliveConfigured) {
-    logger.info(
-      'KeepCallAlive is not configured. Skipping foreground service setup.',
+    logger.warn(
+      'KeepCallAlive is not configured, the call will not survive the app going to the ' +
+        'background: audio publishing stops and the user is eventually dropped from the call. ' +
+        'Declare android.permission.FOREGROUND_SERVICE and ' +
+        'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK in the app manifest (see logcat, ' +
+        'tag StreamVideoReactNative, for the exact list of missing permissions).',
     );
-    return;
+    return false;
   }
   // Check for notification permission (Android 13+) before starting the service.
   const hasPostNotificationsPermission =
@@ -47,7 +57,7 @@ async function startForegroundService(call_cid: string) {
     logger.info(
       'Notification permission not granted, can not start foreground service to keep the call alive',
     );
-    return;
+    return false;
   }
   const videoConfig = StreamVideoRN.getConfig();
   const foregroundServiceConfig = videoConfig.foregroundService;
@@ -58,19 +68,34 @@ async function startForegroundService(call_cid: string) {
   // NOTE: we use requestAnimationFrame to ensure that the foreground service is started after all the current UI operations are done
   // this is a workaround for the crash - android.app.RemoteServiceException$ForegroundServiceDidNotStartInTimeException: Context.startForegroundService() did not then call Service.startForeground()
   // this crash was reproducible only in some android devices
-  requestAnimationFrame(async () => {
-    try {
-      await NativeModules.StreamVideoReactNative.startKeepCallAliveService(
-        call_cid,
-        channel.id,
-        channel.name,
-        notificationTexts.title,
-        notificationTexts.body,
-        smallIconName ?? null,
-      );
-    } catch (e) {
-      logger.warn('Failed to start keep-call-alive foreground service', e);
-    }
+  return new Promise<boolean>((resolve) => {
+    requestAnimationFrame(async () => {
+      // The service declares the camera/microphone foreground service types, which are
+      // while-in-use permissions: Android requires startForegroundService() to be called while the
+      // app has a visible activity, otherwise the start is rejected. The frame we deferred to can
+      // land after the app left the foreground, so re-check before calling native.
+      if (AppState.currentState !== 'active') {
+        logger.info(
+          'App is no longer in the foreground, not starting the keep-call-alive foreground service',
+        );
+        resolve(false);
+        return;
+      }
+      try {
+        await NativeModules.StreamVideoReactNative.startKeepCallAliveService(
+          call_cid,
+          channel.id,
+          channel.name,
+          notificationTexts.title,
+          notificationTexts.body,
+          smallIconName ?? null,
+        );
+        resolve(true);
+      } catch (e) {
+        logger.warn('Failed to start keep-call-alive foreground service', e);
+        resolve(false);
+      }
+    });
   });
 }
 
@@ -147,8 +172,18 @@ export const useAndroidKeepCallAliveEffect = () => {
           return;
         }
 
-        await startForegroundService(activeCallCid);
-        foregroundServiceStartedRef.current = true;
+        try {
+          // only mark as started when native actually accepted the start, so that a later render
+          // while still joined can retry.
+          foregroundServiceStartedRef.current =
+            await startForegroundService(activeCallCid);
+        } catch (e) {
+          // run() is intentionally not awaited, so anything thrown here would surface as an
+          // unhandled rejection. Leave the ref false so a later render can retry.
+          videoLoggerSystem
+            .getLogger('useAndroidKeepCallAliveEffect')
+            .warn('Failed to start the keep-call-alive foreground service', e);
+        }
       };
 
       // ensure that app is active before running the function
@@ -170,6 +205,8 @@ export const useAndroidKeepCallAliveEffect = () => {
     } else if (isCallEnded) {
       if (foregroundServiceStartedRef.current) {
         keepCallAliveCallRef.current = undefined;
+        // let the headless task resolve so RN unwinds it, then stop the foreground service
+        endKeepCallAliveHeadlessTask();
         // stop foreground service when the call is not active
         stopForegroundServiceNoThrow();
         foregroundServiceStartedRef.current = false;
@@ -188,6 +225,7 @@ export const useAndroidKeepCallAliveEffect = () => {
       // stop foreground service when this effect is unmounted
       if (foregroundServiceStartedRef.current) {
         keepCallAliveCallRef.current = undefined;
+        endKeepCallAliveHeadlessTask();
         stopForegroundServiceNoThrow();
         foregroundServiceStartedRef.current = false;
       }