fix: support scenario of accept second call when there is ongoing first call (#1939)

### 💡 Overview

Currently, on RN push, we only support rejecting a incoming call when
already there is an ongoing ringing type call.

This PR makes sure that the opposite is supported. This enables
rejecting the ongoing call and accepting the incoming one.

Author: santhoshvai

packages/react-native-sdk/src/providers/StreamCall/index.tsx

@@ -2,13 +2,11 @@ import { StreamCallProvider } from '@stream-io/video-react-bindings';
 import React, { type PropsWithChildren, useEffect } from 'react';
 import { Call } from '@stream-io/video-client';
 import { useIosCallkeepWithCallingStateEffect } from '../../hooks/push/useIosCallkeepWithCallingStateEffect';
-import {
-  canAddPushWSSubscriptionsRef,
-  clearPushWSEventSubscriptions,
-} from '../../utils/push/internal/utils';
+import { canAddPushWSSubscriptionsRef } from '../../utils/push/internal/utils';
 import { useAndroidKeepCallAliveEffect } from '../../hooks/useAndroidKeepCallAliveEffect';
 import { AppStateListener } from './AppStateListener';
 import { DeviceStats } from './DeviceStats';
+import { pushUnsubscriptionCallbacks } from '../../utils/push/internal/constants';
 
 // const PIP_CHANGE_EVENT = 'StreamVideoReactNative_PIP_CHANGE_EVENT';
 
@@ -68,7 +66,11 @@ const IosInformCallkeepCallEnd = () => {
  */
 const ClearPushWSSubscriptions = () => {
   useEffect(() => {
-    clearPushWSEventSubscriptions();
+    // clear all the push ws event subscriptions
+    pushUnsubscriptionCallbacks.forEach((cbArray) =>
+      cbArray.forEach((cb) => cb()),
+    );
+    pushUnsubscriptionCallbacks.clear();
     canAddPushWSSubscriptionsRef.current = false;
     return () => {
       canAddPushWSSubscriptionsRef.current = true;

packages/react-native-sdk/src/utils/push/android.ts

@@ -2,7 +2,6 @@ import {
   Call,
   CallingState,
   getLogger,
-  RxUtils,
   StreamVideoClient,
 } from '@stream-io/video-client';
 import { AppState, Platform } from 'react-native';
@@ -26,8 +25,8 @@ import {
   pushNonRingingCallData$,
   pushRejectedIncomingCallCId$,
   pushTappedIncomingCallCId$,
-  pushUnsubscriptionCallbacks$,
 } from './internal/rxSubjects';
+import { pushUnsubscriptionCallbacks } from './internal/constants';
 import {
   canAddPushWSSubscriptionsRef,
   clearPushWSEventSubscriptions,
@@ -253,12 +252,8 @@ export const firebaseDataHandler = async (
           );
           unsubscribeFunctions.push(unsubscribe);
           unsubscribeFunctions.push(() => subscription.unsubscribe());
-          const unsubscriptionCallbacks =
-            RxUtils.getCurrentValue(pushUnsubscriptionCallbacks$) ?? [];
-          pushUnsubscriptionCallbacks$.next([
-            ...unsubscriptionCallbacks,
-            ...unsubscribeFunctions,
-          ]);
+          pushUnsubscriptionCallbacks.get(call_cid)?.forEach((cb) => cb());
+          pushUnsubscriptionCallbacks.set(call_cid, unsubscribeFunctions);
         });
       });
     }
@@ -459,7 +454,7 @@ export const onAndroidNotifeeEvent = async ({
         'debug',
         `clearPushWSEventSubscriptions for callCId: ${call_cid} mustAccept: ${mustAccept} mustDecline: ${mustDecline}`,
       );
-      clearPushWSEventSubscriptions();
+      clearPushWSEventSubscriptions(call_cid);
       notifee.stopForegroundService();
     }
 

packages/react-native-sdk/src/utils/push/internal/constants.ts

@@ -0,0 +1,10 @@
+type UnsubscribeCallback = () => void;
+
+/**
+ * This map is used to store the unsubscribe callbacks (if any) of the push notification processing
+ * Note: it should be used to clear it when app processes push notification from foreground
+ */
+export const pushUnsubscriptionCallbacks = new Map<
+  string,
+  UnsubscribeCallback[]
+>();

packages/react-native-sdk/src/utils/push/internal/ios.ts

@@ -1,10 +1,8 @@
-import { getLogger, RxUtils } from '@stream-io/video-client';
+import { getLogger } from '@stream-io/video-client';
 import { AppState, NativeModules, Platform } from 'react-native';
 import { getCallKeepLib, getVoipPushNotificationLib } from '../libs';
-import {
-  pushUnsubscriptionCallbacks$,
-  voipPushNotificationCallCId$,
-} from './rxSubjects';
+import { voipPushNotificationCallCId$ } from './rxSubjects';
+import { pushUnsubscriptionCallbacks } from './constants';
 import { canAddPushWSSubscriptionsRef, shouldCallBeEnded } from './utils';
 import { StreamVideoConfig } from '../../StreamVideoRN/types';
 
@@ -124,12 +122,9 @@ export const onVoipNotificationReceived = async (
         unsubscribe();
       }
     });
-    const unsubscriptionCallbacks =
-      RxUtils.getCurrentValue(pushUnsubscriptionCallbacks$) ?? [];
-    pushUnsubscriptionCallbacks$.next([
-      ...unsubscriptionCallbacks,
-      unsubscribe,
-    ]);
+
+    pushUnsubscriptionCallbacks.get(call_cid)?.forEach((cb) => cb());
+    pushUnsubscriptionCallbacks.set(call_cid, [unsubscribe]);
   }
   // send the info to this subject, it is listened by callkeep events
   // callkeep events will then accept/reject the call

packages/react-native-sdk/src/utils/push/internal/rxSubjects.ts

@@ -69,13 +69,3 @@ export const voipCallkeepCallOnForegroundMap$ = new BehaviorSubject<
 export const voipCallkeepAcceptedCallOnNativeDialerMap$ = new BehaviorSubject<
   CallkeepMap | undefined
 >(undefined);
-
-type UnsubscribeCallback = () => void;
-
-/**
- * This rxjs subject is used to store the unsubscribe callbacks (if any) of the push notification processing
- * Note: it should be used to clear it when app processes push notification from foreground
- */
-export const pushUnsubscriptionCallbacks$ = new BehaviorSubject<
-  UnsubscribeCallback[] | undefined
->(undefined);

packages/react-native-sdk/src/utils/push/internal/utils.ts

@@ -2,15 +2,14 @@ import {
   Call,
   CallingState,
   getLogger,
-  RxUtils,
   StreamVideoClient,
 } from '@stream-io/video-client';
 import type {
   NonRingingPushEvent,
   StreamVideoConfig,
 } from '../../StreamVideoRN/types';
 import { onNewCallNotification } from '../../internal/newNotificationCallbacks';
-import { pushUnsubscriptionCallbacks$ } from './rxSubjects';
+import { pushUnsubscriptionCallbacks } from './constants';
 
 type PushConfig = NonNullable<StreamVideoConfig['push']>;
 
@@ -174,14 +173,12 @@ export const processNonIncomingCallFromPush = async (
  * This function is used to clear all the push related WS subscriptions
  * note: events are subscribed in push for accept/decline through WS
  */
-export const clearPushWSEventSubscriptions = () => {
-  const unsubscriptionCallbacks = RxUtils.getCurrentValue(
-    pushUnsubscriptionCallbacks$,
-  );
+export const clearPushWSEventSubscriptions = (call_cid: string) => {
+  const unsubscriptionCallbacks = pushUnsubscriptionCallbacks.get(call_cid);
   if (unsubscriptionCallbacks) {
     unsubscriptionCallbacks.forEach((cb) => cb());
+    pushUnsubscriptionCallbacks.delete(call_cid);
   }
-  pushUnsubscriptionCallbacks$.next(undefined);
 };
 
 /**

packages/react-native-sdk/src/utils/push/setupIosCallKeepEvents.ts

@@ -37,24 +37,29 @@ export function setupIosCallKeepEvents(
   const callkeep = getCallKeepLib();
 
   async function getCallCid(callUUID: string): Promise<string | undefined> {
-    let call_cid = RxUtils.getCurrentValue(voipPushNotificationCallCId$);
-    if (!call_cid) {
-      // if call_cid is not available, try to get it from native module
-      try {
-        call_cid =
-          await NativeModules?.StreamVideoReactNative?.getIncomingCallCid(
-            callUUID,
-          );
-        voipPushNotificationCallCId$.next(call_cid);
-      } catch (error) {
+    try {
+      const call_cid =
+        await NativeModules.StreamVideoReactNative.getIncomingCallCid(callUUID);
+      // in a case that voipPushNotificationCallCId$ is empty (this should not happen as voipPushNotificationCallCId$ is updated in push reception)]
+      // update it with this call_cid
+      const voipPushNotificationCallCId = RxUtils.getCurrentValue(
+        voipPushNotificationCallCId$,
+      );
+      if (!voipPushNotificationCallCId) {
         logger(
           'debug',
-          'Error in getting call cid from native module - probably the call was already processed, so ignoring this callkeep event',
-          error,
+          `voipPushNotificationCallCId$ is empty, updating it with the call_cid: ${call_cid} for callUUID: ${callUUID}`,
         );
+        voipPushNotificationCallCId$.next(call_cid);
       }
+      return call_cid;
+    } catch {
+      logger(
+        'debug',
+        `Error in getting call cid from native module for callUUID: ${callUUID} - probably the call was already processed, so ignoring this callkeep event`,
+      );
     }
-    return call_cid;
+    return undefined;
   }
 
   function answerCall(callUUID: string) {
@@ -150,7 +155,7 @@ const iosCallkeepAcceptCall = (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
-  clearPushWSEventSubscriptions();
+  clearPushWSEventSubscriptions(call_cid);
   // to call end callkeep later if ended in app and not through callkeep
   voipCallkeepAcceptedCallOnNativeDialerMap$.next({
     uuid: callUUIDFromCallkeep,
@@ -170,11 +175,17 @@ const iosCallkeepRejectCall = async (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
-  clearPushWSEventSubscriptions();
-  // no need to keep these references anymore
-  voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
-  voipCallkeepCallOnForegroundMap$.next(undefined);
-  voipPushNotificationCallCId$.next(undefined);
+  clearPushWSEventSubscriptions(call_cid);
+  // remove the references if the call_cid matches
+  const voipPushNotificationCallCId = RxUtils.getCurrentValue(
+    voipPushNotificationCallCId$,
+  );
+  if (voipPushNotificationCallCId === call_cid) {
+    voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
+    voipCallkeepCallOnForegroundMap$.next(undefined);
+    voipPushNotificationCallCId$.next(undefined);
+  }
+
   await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
   await NativeModules.StreamVideoReactNative?.removeIncomingCall(call_cid);
 };