@stream-io/video-react-native-sdk 1.2.16 → 1.3.1

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

@@ -1,43 +1,15 @@
-import { Call, StreamVideoClient } from '@stream-io/video-client';
-import type { NonRingingPushEvent, StreamVideoConfig } from '../StreamVideoRN/types';
-type PushConfig = NonNullable<StreamVideoConfig['push']>;
-type CanAddPushWSSubscriptionsRef = {
-    current: boolean;
-};
-/**
- * This function is used to check if the call should be ended based on the push notification
- * Useful for callkeep management to end the call if necessary (with reportEndCallWithUUID)
- */
-export declare const shouldCallBeEnded: (callFromPush: Call, created_by_id: string | undefined, receiver_id: string | undefined) => {
-    mustEndCall: boolean;
-    callkeepReason: number;
-};
-export declare const processCallFromPushInBackground: (pushConfig: PushConfig, call_cid: string, action: Parameters<typeof processCallFromPush>[2]) => Promise<void>;
-/**
- * This function is used process the call from push notifications due to incoming call
- * It does the following steps:
- * 1. Get the call from the client if present or create a new call
- * 2. Fetch the latest state of the call from the server if its not already in ringing state
- * 3. Join or leave the call based on the user's action.
- */
-export declare const processCallFromPush: (client: StreamVideoClient, call_cid: string, action: "accept" | "decline" | "pressed" | "backgroundDelivered", pushConfig: PushConfig) => Promise<void>;
-/**
- * This function is used process the call from push notifications due to non ringing calls
- * It does the following steps:
- * 1. Get the call from the client if present or create a new call
- * 2. Fetch the latest state of the call from the server if its not already in ringing state
- * 3. Call all the callbacks to inform the app about the call
- */
-export declare const processNonIncomingCallFromPush: (client: StreamVideoClient, call_cid: string, nonRingingNotificationType: NonRingingPushEvent) => Promise<void>;
-/**
- * This function is used to clear all the push related WS subscriptions
- * note: events are subscribed in push for accept/decline through WS
- */
-export declare const clearPushWSEventSubscriptions: () => void;
-/**
- * This ref is used to check if the push WS subscriptions can be added
- * It is used to avoid adding the push WS subscriptions when the client is connected to WS in the foreground
- */
-export declare const canAddPushWSSubscriptionsRef: CanAddPushWSSubscriptionsRef;
-export {};
+import { Event } from '@notifee/react-native';
+import { FirebaseMessagingTypes } from './libs/firebaseMessaging';
+import { ExpoNotification } from './libs/expoNotifications';
+import { NonRingingPushEvent } from '../StreamVideoRN/types';
+import { PushNotificationiOSType } from './libs/iosPushNotification';
+export type StreamPushPayload = {
+    call_cid: string;
+    type: 'call.ring' | NonRingingPushEvent;
+    sender: string;
+} | undefined;
+export declare function isFirebaseStreamVideoMessage(message: FirebaseMessagingTypes.RemoteMessage): boolean;
+export declare function isNotifeeStreamVideoEvent(event: Event): boolean;
+export declare function isExpoNotificationStreamVideoEvent(event: ExpoNotification): boolean | undefined;
+export declare function isPushNotificationiOSStreamVideoEvent(notification: PushNotificationiOSType): 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,EACL,IAAI,EAGJ,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAIhC,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAEzD,KAAK,4BAA4B,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,iBACd,IAAI,iBACH,MAAM,GAAG,SAAS,eACpB,MAAM,GAAG,SAAS;;;CAmChC,CAAC;AAMF,eAAO,MAAM,+BAA+B,eAC9B,UAAU,YACZ,MAAM,UACR,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,kBAelD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,WACtB,iBAAiB,YACf,MAAM,UACR,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,qBAAqB,cACpD,UAAU,kBA4BvB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,WACjC,iBAAiB,YACf,MAAM,8BACY,mBAAmB,kBAmBhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,6BAA6B,YAQzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,EAAE,4BAE1C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,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;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,WAIrD;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,gBAAgB,uBAYzE;AAED,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,WAKtC"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.2.15";
+export declare const version = "1.3.1";
 //# 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,UAAU,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "1.2.16",
+  "version": "1.3.1",
   "packageManager": "yarn@3.2.4",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",
@@ -65,7 +65,6 @@
     "expo": ">=47.0.0",
     "expo-build-properties": "*",
     "expo-notifications": "*",
-    "expo-task-manager": "*",
     "react": ">=17.0.0",
     "react-native": ">=0.67.0",
     "react-native-callkeep": ">=4.3.11",
@@ -100,9 +99,6 @@
     "expo-notifications": {
       "optional": true
     },
-    "expo-task-manager": {
-      "optional": true
-    },
     "react-native-callkeep": {
       "optional": true
     },
@@ -122,11 +118,11 @@
     "@notifee/react-native": "7.8.0",
     "@react-native-community/netinfo": "9.3.9",
     "@react-native-community/push-notification-ios": "1.11.0",
-    "@react-native-firebase/app": "17.5.0",
-    "@react-native-firebase/messaging": "17.5.0",
+    "@react-native-firebase/app": "19.2.2",
+    "@react-native-firebase/messaging": "19.2.2",
     "@react-native/eslint-config": "^0.74.84",
     "@stream-io/react-native-webrtc": "118.1.0",
-    "@stream-io/video-filters-react-native": "workspace:^",
+    "@stream-io/video-filters-react-native": "^0.2.4",
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^12.1.2",
     "@tsconfig/node14": "14.1.0",
@@ -139,8 +135,7 @@
     "expo": "50.0.19",
     "expo-build-properties": "^0.12.3",
     "expo-modules-core": "1.12.16",
-    "expo-notifications": "~0.27.8",
-    "expo-task-manager": "~11.7.3",
+    "expo-notifications": "~0.28.18",
     "jest": "^29.7.0",
     "react-native": "0.71.8",
     "react-native-builder-bob": "^0.23.2",
@@ -168,4 +163,4 @@
       "typescript"
     ]
   }
-}
+}

package/src/components/Call/CallControls/IncomingCallControls.tsx

@@ -28,7 +28,10 @@ export const IncomingCallControls = ({
   } = useTheme();
   return (
     <View style={[styles.buttonGroup, incomingCall.buttonGroup]}>
-      <RejectCallButton onPressHandler={onRejectCallHandler} />
+      <RejectCallButton
+        onPressHandler={onRejectCallHandler}
+        rejectReason="decline"
+      />
       <ToggleVideoPreviewButton />
       <AcceptCallButton onPressHandler={onAcceptCallHandler} />
     </View>

package/src/components/Call/CallControls/OutgoingCallControls.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useTheme } from '../../../contexts';
-import { HangUpCallButton } from './HangupCallButton';
 import { ToggleAudioPreviewButton } from './ToggleAudioPreviewButton';
 import { ToggleVideoPreviewButton } from './ToggleVideoPreviewButton';
+import { RejectCallButton } from './RejectCallButton';
 
 /**
  * Props for the OutgoingCallControls Component.
@@ -32,9 +32,10 @@ export const OutgoingCallControls = ({
         <ToggleAudioPreviewButton />
         <ToggleVideoPreviewButton />
       </View>
-      <HangUpCallButton
+      <RejectCallButton
         onPressHandler={onHangupCallHandler}
         size={buttonSizes.md}
+        rejectReason="cancel"
       />
     </View>
   );

package/src/components/Call/CallControls/RejectCallButton.tsx

@@ -20,16 +20,32 @@ type RejectCallButtonProps = {
    * Note: If the `onPressHandler` is passed this handler will not be executed.
    */
   onRejectCallHandler?: () => void;
+  /**
+   * Sets the height, width and border-radius (half the value) of the button.
+   */
+  size?: React.ComponentProps<typeof CallControlsButton>['size'];
+  /**
+   * Optional: Reason for rejecting the call.
+   * Pass a predefined or a custom reason.
+   * There are four predefined reasons for rejecting the call: 
+    - `busy` - when the callee is busy and cannot accept the call.
+    - `decline` - when the callee intentionally declines the call.
+    - `cancel` - when the caller cancels the call.
+    - `timeout` - when the **caller** or **callee** rejects the call after `auto_cancel_timeout_ms` or `incoming_call_timeout_ms` accordingly.
+   */
+  rejectReason?: string;
 };
 
 /**
  * Button to reject a call.
  *
- * Mostly calls call.leave({ reject: true }) internally.
+ * Calls call.leave({ reject: true, reason: `OPTIONAL-REASON` }) internally.
  */
 export const RejectCallButton = ({
   onPressHandler,
   onRejectCallHandler,
+  size,
+  rejectReason,
 }: RejectCallButtonProps) => {
   const call = useCall();
   const { useCallCallingState } = useCallStateHooks();
@@ -50,7 +66,7 @@ export const RejectCallButton = ({
       if (callingState === CallingState.LEFT) {
         return;
       }
-      await call?.leave({ reject: true });
+      await call?.leave({ reject: true, reason: rejectReason });
       if (onRejectCallHandler) {
         onRejectCallHandler();
       }
@@ -64,7 +80,7 @@ export const RejectCallButton = ({
     <CallControlsButton
       onPress={rejectCallHandler}
       color={colors.error}
-      size={buttonSizes.lg}
+      size={size ?? buttonSizes.lg}
       // TODO: check what to do about this random style prop
       // svgContainerStyle={theme.icon.lg}
       style={rejectCallButton}

package/src/hooks/push/useIosCallKeepEventsSetupEffect.ts

@@ -2,16 +2,23 @@ import { useEffect } from 'react';
 import {
   voipCallkeepCallOnForegroundMap$,
   voipPushNotificationCallCId$,
-} from '../../utils/push/rxSubjects';
+} from '../../utils/push/internal/rxSubjects';
 import { RxUtils } from '@stream-io/video-client';
-import {
-  iosCallkeepAcceptCall,
-  iosCallkeepRejectCall,
-} from '../../utils/push/ios';
 import { getCallKeepLib } from '../../utils/push/libs';
-import { StreamVideoRN } from '../../utils';
+import { StreamVideoRN } from '../../utils/StreamVideoRN';
+import type { StreamVideoConfig } from '../../utils/StreamVideoRN/types';
+import {
+  clearPushWSEventSubscriptions,
+  processCallFromPushInBackground,
+} from '../../utils/push/internal/utils';
+import {
+  pushAcceptedIncomingCallCId$,
+  voipCallkeepAcceptedCallOnNativeDialerMap$,
+} from '../../utils/push/internal/rxSubjects';
 import { Platform } from 'react-native';
 
+type PushConfig = NonNullable<StreamVideoConfig['push']>;
+
 /**
  * This hook is used to listen to callkeep events and do the necessary actions
  */
@@ -62,3 +69,52 @@ export const useIosCallKeepEventsSetupEffect = () => {
     };
   }, []);
 };
+
+const iosCallkeepAcceptCall = (
+  call_cid: string | undefined,
+  callUUIDFromCallkeep: string
+) => {
+  if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
+    return;
+  }
+  clearPushWSEventSubscriptions();
+  // to call end callkeep later if ended in app and not through callkeep
+  voipCallkeepAcceptedCallOnNativeDialerMap$.next({
+    uuid: callUUIDFromCallkeep,
+    cid: call_cid,
+  });
+  // to process the call in the app
+  pushAcceptedIncomingCallCId$.next(call_cid);
+  // no need to keep these references anymore
+  voipCallkeepCallOnForegroundMap$.next(undefined);
+};
+
+const iosCallkeepRejectCall = async (
+  call_cid: string | undefined,
+  callUUIDFromCallkeep: string,
+  pushConfig: PushConfig
+) => {
+  if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
+    return;
+  }
+  clearPushWSEventSubscriptions();
+  // no need to keep these references anymore
+  voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
+  voipCallkeepCallOnForegroundMap$.next(undefined);
+  voipPushNotificationCallCId$.next(undefined);
+  await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
+};
+
+/**
+ * Helper function to determine if the answer/end call event from callkeep must be processed
+ * Just checks if we have a valid call_cid and acts as a type guard for call_cid
+ */
+const shouldProcessCallFromCallkeep = (
+  call_cid: string | undefined,
+  callUUIDFromCallkeep: string
+): call_cid is string => {
+  if (!call_cid || !callUUIDFromCallkeep) {
+    return false;
+  }
+  return true;
+};

package/src/hooks/push/useIosCallkeepWithCallingStateEffect.ts

@@ -7,7 +7,7 @@ import { getCallKeepLib } from '../../utils/push/libs';
 import {
   voipCallkeepAcceptedCallOnNativeDialerMap$,
   voipCallkeepCallOnForegroundMap$,
-} from '../../utils/push/rxSubjects';
+} from '../../utils/push/internal/rxSubjects';
 
 const isNonActiveCallingState = (callingState: CallingState) => {
   return (

package/src/hooks/push/useIosVoipPushEventsSetupEffect.ts

@@ -12,11 +12,11 @@ import { NativeModules } from 'react-native';
 import {
   canAddPushWSSubscriptionsRef,
   shouldCallBeEnded,
-} from '../../utils/push/utils';
+} from '../../utils/push/internal/utils';
 import {
   pushUnsubscriptionCallbacks$,
   voipPushNotificationCallCId$,
-} from '../../utils/push/rxSubjects';
+} from '../../utils/push/internal/rxSubjects';
 import { RxUtils, getLogger } from '@stream-io/video-client';
 
 let lastVoipToken = { token: '', userId: '' };

package/src/hooks/push/useProcessPushCallEffect.ts

@@ -3,7 +3,7 @@ import {
   pushAndroidBackgroundDeliveredIncomingCallCId$,
   pushRejectedIncomingCallCId$,
   pushTappedIncomingCallCId$,
-} from '../../utils/push/rxSubjects';
+} from '../../utils/push/internal/rxSubjects';
 import { useEffect } from 'react';
 import { StreamVideoRN } from '../../utils';
 import {
@@ -12,7 +12,7 @@ import {
 } from '@stream-io/video-react-bindings';
 import { BehaviorSubject } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { processCallFromPush } from '../../utils/push/utils';
+import { processCallFromPush } from '../../utils/push/internal/utils';
 import { StreamVideoClient } from '@stream-io/video-client';
 import type { StreamVideoConfig } from '../../utils/StreamVideoRN/types';
 
@@ -92,11 +92,6 @@ const createCallSubscription = (
     .pipe(filter(cidIsNotUndefined))
     .subscribe(async (callCId) => {
       await processCallFromPush(client, callCId, action, pushConfig);
-      if (action === 'accept') {
-        pushConfig.navigateAcceptCall();
-      } else if (action === 'pressed' || action === 'backgroundDelivered') {
-        pushConfig.navigateToIncomingCall();
-      }
       behaviourSubjectWithCallCid.next(undefined); // remove the current call id to avoid processing again
     });
 };

package/src/hooks/push/useProcessPushNonRingingCallEffect.ts

@@ -1,4 +1,4 @@
-import { pushNonRingingCallData$ } from '../../utils/push/rxSubjects';
+import { pushNonRingingCallData$ } from '../../utils/push/internal/rxSubjects';
 import { useEffect } from 'react';
 import { StreamVideoRN } from '../../utils';
 import {
@@ -6,7 +6,7 @@ import {
   useStreamVideoClient,
 } from '@stream-io/video-react-bindings';
 import { filter } from 'rxjs/operators';
-import { processNonIncomingCallFromPush } from '../../utils/push/utils';
+import { processNonIncomingCallFromPush } from '../../utils/push/internal/utils';
 
 /**
  * This hook is used to process the non ringing call data via push notifications using the relevant rxjs subject
@@ -16,7 +16,7 @@ import { processNonIncomingCallFromPush } from '../../utils/push/utils';
 export const useProcessPushNonRingingCallEffect = () => {
   const client = useStreamVideoClient();
   const connectedUserId = useConnectedUser()?.id;
-  // The Effect to join/reject call automatically when incoming call was received and processed from push notification
+  // The Effect to automatically add the non ringing call to our low level client state
   useEffect(() => {
     const pushConfig = StreamVideoRN.getConfig().push;
     if (!pushConfig || !client || !connectedUserId) {

package/src/hooks/useAndroidKeepCallAliveEffect.ts

@@ -37,6 +37,7 @@ async function startForegroundService(call_cid: string) {
     );
     return;
   }
+  // channel id is not required for notifee as its only used on android 7 and below here
   await notifeeLib.default.displayNotification({
     id: call_cid,
     title,

package/src/providers/StreamCall.tsx

@@ -5,7 +5,7 @@ import { useIosCallkeepWithCallingStateEffect } from '../hooks/push/useIosCallke
 import {
   canAddPushWSSubscriptionsRef,
   clearPushWSEventSubscriptions,
-} from '../utils/push/utils';
+} from '../utils/push/internal/utils';
 import { useAndroidKeepCallAliveEffect } from '../hooks/useAndroidKeepCallAliveEffect';
 import { AppState, NativeModules, Platform } from 'react-native';
 import { shouldDisableIOSLocalVideoOnBackgroundRef } from '../utils/internal/shouldDisableIOSLocalVideoOnBackground';

package/src/utils/StreamVideoRN/index.ts

@@ -1,7 +1,5 @@
-import { setupFirebaseHandlerAndroid } from '../push/android';
 import { StreamVideoConfig } from './types';
 import pushLogoutCallbacks from '../internal/pushLogoutCallback';
-import { setupRemoteNotificationsHandleriOS } from '../push/ios';
 import newNotificationCallbacks, {
   NewCallNotificationCallback,
 } from '../internal/newNotificationCallbacks';
@@ -66,11 +64,18 @@ export class StreamVideoRN {
       // Ignoring this config as push config was already set
       return;
     }
+    if (
+      __DEV__ &&
+      (pushConfig.navigateAcceptCall || pushConfig.navigateToIncomingCall)
+    ) {
+      throw new Error(
+        `Support for navigateAcceptCall or navigateToIncomingCall in pushConfig has been removed.
+        Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information.`
+      );
+    }
+
     this.config.push = pushConfig;
-    // After getting the config we should setup callkeep events, firebase handler asap to handle incoming calls from a dead state
-    setupFirebaseHandlerAndroid(pushConfig);
-    // setup ios handler for non-voip push notifications asap
-    setupRemoteNotificationsHandleriOS(pushConfig);
   }
 
   static getConfig() {

package/src/utils/StreamVideoRN/types.ts

@@ -107,10 +107,12 @@ export type StreamVideoConfig = {
      * }
      */
     createStreamVideoClient: () => Promise<StreamVideoClient | undefined>;
-    /** The callback that is called when a call is accepted, used for navigation */
-    navigateAcceptCall: () => void;
-    /** The callback that is called when a push notification is tapped but user did not press accept or decline, used for navigation */
-    navigateToIncomingCall: () => void;
+    /** @deprecated This method will be removed in the future. Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information */
+    navigateAcceptCall?: () => void;
+    /** @deprecated This method will be removed in the future. Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information */
+    navigateToIncomingCall?: () => void;
     /** Callback that is called when a non ringing push notification was tapped */
     onTapNonRingingCallNotification?: (
       call_cid: string,

package/src/utils/index.ts

@@ -38,5 +38,6 @@ export const getInitialsOfName = (name: string) => {
   return initials;
 };
 
+export * from './push/index';
 export * from './enterPiPAndroid';
 export * from './StreamVideoRN';

package/src/utils/push/android.ts

@@ -1,4 +1,3 @@
-import { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
 import {
   Call,
   RxUtils,
@@ -12,11 +11,10 @@ import type {
 } from '../StreamVideoRN/types';
 import {
   getFirebaseMessagingLib,
-  getFirebaseMessagingLibNoThrow,
   getExpoNotificationsLib,
-  getExpoTaskManagerLib,
   getNotifeeLibThrowIfNotInstalledForPush,
   NotifeeLib,
+  FirebaseMessagingTypes,
 } from './libs';
 import {
   pushAcceptedIncomingCallCId$,
@@ -25,15 +23,16 @@ import {
   pushNonRingingCallData$,
   pushUnsubscriptionCallbacks$,
   pushAndroidBackgroundDeliveredIncomingCallCId$,
-} from './rxSubjects';
+} from './internal/rxSubjects';
 import {
   canAddPushWSSubscriptionsRef,
   clearPushWSEventSubscriptions,
   processCallFromPushInBackground,
   shouldCallBeEnded,
-} from './utils';
+} from './internal/utils';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
 import { getAndroidDefaultRingtoneUrl } from '../getAndroidDefaultRingtoneUrl';
+import { StreamVideoRN } from '../StreamVideoRN';
 
 const ACCEPT_CALL_ACTION_ID = 'accept';
 const DECLINE_CALL_ACTION_ID = 'decline';
@@ -48,89 +47,6 @@ type Event = Parameters<onBackgroundEventFunctionParams>[0];
 
 let lastFirebaseToken = { token: '', userId: '' };
 
-//  EventType = NotifeeLib['EventType'];
-
-/** Setup Firebase push message handler **/
-export function setupFirebaseHandlerAndroid(pushConfig: PushConfig) {
-  if (Platform.OS !== 'android') {
-    return;
-  }
-  if (pushConfig.isExpo) {
-    const messaging = getFirebaseMessagingLibNoThrow(true);
-    if (messaging) {
-      // handles on app killed state in expo, expo-notifications cannot handle that
-      messaging().setBackgroundMessageHandler(
-        async (msg) =>
-          await firebaseMessagingOnMessageHandler(msg.data, pushConfig)
-      );
-      messaging().onMessage((msg) =>
-        firebaseMessagingOnMessageHandler(msg.data, pushConfig)
-      ); // this is to listen to foreground messages, which we dont need for now
-    } else {
-      const Notifications = getExpoNotificationsLib();
-      const TaskManager = getExpoTaskManagerLib();
-      const BACKGROUND_NOTIFICATION_TASK =
-        'STREAM-VIDEO-SDK-INTERNAL-BACKGROUND-NOTIFICATION-TASK';
-
-      TaskManager.defineTask(
-        BACKGROUND_NOTIFICATION_TASK,
-        ({ data, error }) => {
-          if (error) {
-            return;
-          }
-          // @ts-ignore
-          const dataToProcess = data.notification?.data;
-          firebaseMessagingOnMessageHandler(dataToProcess, pushConfig);
-        }
-      );
-      // background handler (does not handle on app killed state)
-      Notifications.registerTaskAsync(BACKGROUND_NOTIFICATION_TASK);
-      // foreground handler
-      Notifications.setNotificationHandler({
-        handleNotification: async (notification) => {
-          // @ts-ignore
-          const trigger = notification?.request?.trigger;
-          if (trigger.type === 'push') {
-            const data = trigger?.remoteMessage?.data;
-            if (data?.sender === 'stream.video') {
-              await firebaseMessagingOnMessageHandler(data, pushConfig);
-              return {
-                shouldShowAlert: false,
-                shouldPlaySound: false,
-                shouldSetBadge: false,
-              };
-            }
-          }
-          return {
-            shouldShowAlert: true,
-            shouldPlaySound: false,
-            shouldSetBadge: false,
-          };
-        },
-      });
-    }
-  } else {
-    const messaging = getFirebaseMessagingLib();
-    messaging().setBackgroundMessageHandler(
-      async (msg) =>
-        await firebaseMessagingOnMessageHandler(msg.data, pushConfig)
-    );
-    messaging().onMessage((msg) =>
-      firebaseMessagingOnMessageHandler(msg.data, pushConfig)
-    ); // this is to listen to foreground messages, which we dont need for now
-  }
-
-  // the notification tap handlers are always registered with notifee for both expo and non-expo in android
-  const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
-  const notifee = notifeeLib.default;
-  notifee.onBackgroundEvent(async (event) => {
-    await onNotifeeEvent(event, pushConfig, true);
-  });
-  notifee.onForegroundEvent((event) => {
-    onNotifeeEvent(event, pushConfig, false);
-  });
-}
-
 /** Send token to stream, create notification channel,  */
 export async function initAndroidPushToken(
   client: StreamVideoClient,
@@ -184,10 +100,14 @@ export async function initAndroidPushToken(
   }
 }
 
-const firebaseMessagingOnMessageHandler = async (
-  data: FirebaseMessagingTypes.RemoteMessage['data'],
-  pushConfig: PushConfig
+/**
+ * Creates notification from the push message data.
+ * For Ringing and Non-Ringing calls.
+ */
+export const firebaseDataHandler = async (
+  data: FirebaseMessagingTypes.RemoteMessage['data']
 ) => {
+  if (Platform.OS !== 'android') return;
   /* Example data from firebase
     "message": {
         "data": {
@@ -203,7 +123,8 @@ const firebaseMessagingOnMessageHandler = async (
         // other stuff
     }
   */
-  if (!data || data.sender !== 'stream.video') {
+  const pushConfig = StreamVideoRN.getConfig().push;
+  if (!pushConfig || !data || data.sender !== 'stream.video') {
     return;
   }
 
@@ -377,16 +298,25 @@ const firebaseMessagingOnMessageHandler = async (
   }
 };
 
-const onNotifeeEvent = async (
-  event: Event,
-  pushConfig: PushConfig,
-  isBackground: boolean
-) => {
+export const onAndroidNotifeeEvent = async ({
+  event,
+  isBackground,
+}: {
+  event: Event;
+  isBackground: boolean;
+}) => {
+  if (Platform.OS !== 'android') return;
   const { type, detail } = event;
   const { notification, pressAction } = detail;
   const notificationId = notification?.id;
   const data = notification?.data;
-  if (!data || !notificationId || data.sender !== 'stream.video') {
+  const pushConfig = StreamVideoRN.getConfig().push;
+  if (
+    !pushConfig ||
+    !data ||
+    !notificationId ||
+    data.sender !== 'stream.video'
+  ) {
     return;
   }
 
@@ -443,7 +373,6 @@ const onNotifeeEvent = async (
   } else {
     const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
     if (type === notifeeLib.EventType.PRESS) {
-      pushTappedIncomingCallCId$.next(call_cid);
       pushConfig.onTapNonRingingCallNotification?.(
         call_cid,
         data.type as NonRingingPushEvent

package/src/utils/push/index.ts

@@ -0,0 +1,3 @@
+export * from './android';
+export * from './ios';
+export * from './utils';