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

package/dist/module/utils/StreamVideoRN/index.js

@@ -1,10 +1,8 @@
 import pushLogoutCallbacks from '../internal/pushLogoutCallback';
 import newNotificationCallbacks from '../internal/newNotificationCallbacks';
+import { setupIosCallKeepEvents } from '../push/setupIosCallKeepEvents';
 import { setupIosVoipPushEvents } from '../push/setupIosVoipPushEvents';
-import { setupCallingExpEvents } from '../push/setupCallingExpEvents';
-import { extractCallingExpOptions, getCallingxLib } from '../push/libs/callingx';
 import { NativeModules, Platform } from 'react-native';
-import { videoLoggerSystem } from '@stream-io/video-client';
 
 // Utility type for deep partial
 
@@ -29,7 +27,10 @@ const DEFAULT_STREAM_VIDEO_CONFIG = {
     android: {
       channel: {
         id: 'stream_call_foreground_service',
-        name: 'Ongoing calls'
+        name: 'To keep calls alive',
+        lights: false,
+        vibration: false,
+        importance: 3
       },
       notificationTexts: {
         title: 'Call in progress',
@@ -51,6 +52,15 @@ export class StreamVideoRN {
   static updateConfig(updateConfig) {
     this.config = deepMerge(this.config, updateConfig);
   }
+  static updateAndroidIncomingCallChannel(updateChannel) {
+    const prevChannel = this.config.push?.android?.incomingCallChannel;
+    if (prevChannel) {
+      this.config.push.android.incomingCallChannel = {
+        ...prevChannel,
+        ...updateChannel
+      };
+    }
+  }
 
   /**
    * Set the push config for StreamVideoRN.
@@ -64,28 +74,7 @@ export class StreamVideoRN {
    * import App from './App';
    * // Set push config
    * const pushConfig = {}; // construct your config
-   * // Set CallKit/Android Telecom API integration options. All params are optional. If not provided, the default values will be used.
-   * const callingExpOptions = {
-   *   ios: {
-   *     callsHistory: true,
-   *     displayCallTimeout: 60000,
-   *     sound: 'ringtone',
-   *     imageName: 'callkit_icon',
-   *   },
-   *   android: {
-   *     incomingChannel: {
-   *       id: 'stream_incoming_call_notifications',
-   *       name: 'Call notifications',
-   *       vibration: true,
-   *       sound: 'default',
-   *     },
-   *     titleTransformer: (memberName: string, incoming: boolean) =>
-   *       incoming
-   *         ? `${memberName} is calling you`
-   *         : `You are calling ${memberName}`,
-   *   },
-   * };
-   * StreamVideoRN.setPushConfig(pushConfig, callingExpOptions);
+   * StreamVideoRN.setPushConfig(pushConfig);
    * AppRegistry.registerComponent('app', () => App);
    */
   static setPushConfig(pushConfig) {
@@ -93,16 +82,13 @@ export class StreamVideoRN {
       // Ignoring this config as push config was already set
       return;
     }
-    this.config.push = pushConfig;
-    try {
-      const callingx = getCallingxLib();
-      videoLoggerSystem.getLogger('StreamVideoRN.setPushConfig').info(JSON.stringify(this.config));
-      const options = extractCallingExpOptions(this.config);
-      callingx.setup(options);
-    } catch {
-      throw new Error('react-native-callingx library is not installed. Please check the installation instructions: https://getstream.io/video/docs/react-native/incoming-calls/ringing-setup/react-native/.');
+    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.`);
     }
-    setupCallingExpEvents(pushConfig);
+    this.config.push = pushConfig;
+    setupIosCallKeepEvents(pushConfig);
     setupIosVoipPushEvents(pushConfig);
   }
   static getConfig() {

package/dist/module/utils/StreamVideoRN/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["pushLogoutCallbacks","newNotificationCallbacks","setupIosVoipPushEvents","setupCallingExpEvents","extractCallingExpOptions","getCallingxLib","NativeModules","Platform","videoLoggerSystem","deepMerge","target","source","result","key","undefined","Array","isArray","DEFAULT_STREAM_VIDEO_CONFIG","foregroundService","android","channel","id","name","notificationTexts","title","body","taskToRun","Promise","StreamVideoRN","config","busyToneTimeout","updateConfig","setPushConfig","pushConfig","push","callingx","getLogger","info","JSON","stringify","options","setup","Error","getConfig","onPushLogout","current","all","map","callback","then","resolve","clearPushLogoutCallbacks","addOnNewCallNotificationListener","filter","cb","playBusyTone","StreamVideoReactNative","stopBusyTone","androidHasAudioOutputHardware","OS","hasAudioOutputHardware","androidHasMicrophoneHardware","hasMicrophoneHardware","androidHasCameraHardware","hasCameraHardware"],"sourceRoot":"../../../../src","sources":["utils/StreamVideoRN/index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["pushLogoutCallbacks","newNotificationCallbacks","setupIosCallKeepEvents","setupIosVoipPushEvents","NativeModules","Platform","deepMerge","target","source","result","key","undefined","Array","isArray","DEFAULT_STREAM_VIDEO_CONFIG","foregroundService","android","channel","id","name","lights","vibration","importance","notificationTexts","title","body","taskToRun","Promise","StreamVideoRN","config","busyToneTimeout","updateConfig","updateAndroidIncomingCallChannel","updateChannel","prevChannel","push","incomingCallChannel","setPushConfig","pushConfig","__DEV__","navigateAcceptCall","navigateToIncomingCall","Error","getConfig","onPushLogout","current","all","map","callback","then","resolve","clearPushLogoutCallbacks","addOnNewCallNotificationListener","filter","cb","playBusyTone","StreamVideoReactNative","stopBusyTone","androidHasAudioOutputHardware","OS","hasAudioOutputHardware","androidHasMicrophoneHardware","hasMicrophoneHardware","androidHasCameraHardware","hasCameraHardware"],"sourceRoot":"../../../../src","sources":["utils/StreamVideoRN/index.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/utils/internal/registerSDKGlobals.js

@@ -1,68 +1,18 @@
 import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
-import { getCallingxLibIfAvailable } from '../push/libs/callingx';
-import { endCallingxCall, registerOutgoingCall, joinCallingxCall } from './callingx/callingx';
 const StreamInCallManagerNativeModule = NativeModules.StreamInCallManager;
 const StreamVideoReactNativeModule = NativeModules.StreamVideoReactNative;
-const CallingxModule = getCallingxLibIfAvailable();
-
-/**
- * Checks if StreamInCallManager should be bypassed because CallKit is handling
- * the audio session via CallingX.
- *
- * On iOS, when CallingX is set up and has a registered call, the audio session
- * is managed by CallKit through CallingxImpl.swift.
- * In this case, StreamInCallManager should not run to avoid conflicting audio
- * session configurations.
- */
-const shouldBypassForCallKit = ({
-  isRingingTypeCall
-}) => {
-  if (Platform.OS !== 'ios') {
-    return false;
-  }
-  if (!CallingxModule) {
-    return false;
-  }
-  const bypass = CallingxModule.isSetup && (isRingingTypeCall || CallingxModule.isOngoingCallsEnabled);
-  return bypass;
-};
 const streamRNVideoSDKGlobals = {
-  callingX: {
-    joinCall: joinCallingxCall,
-    endCall: endCallingxCall,
-    registerOutgoingCall: registerOutgoingCall
-  },
   callManager: {
     setup: ({
-      defaultDevice,
-      isRingingTypeCall
+      defaultDevice
     }) => {
-      if (shouldBypassForCallKit({
-        isRingingTypeCall
-      })) {
-        return;
-      }
       StreamInCallManagerNativeModule.setDefaultAudioDeviceEndpointType(defaultDevice);
       StreamInCallManagerNativeModule.setup();
     },
-    start: ({
-      isRingingTypeCall
-    }) => {
-      if (shouldBypassForCallKit({
-        isRingingTypeCall
-      })) {
-        return;
-      }
+    start: () => {
       StreamInCallManagerNativeModule.start();
     },
-    stop: ({
-      isRingingTypeCall
-    }) => {
-      if (shouldBypassForCallKit({
-        isRingingTypeCall
-      })) {
-        return;
-      }
+    stop: () => {
       StreamInCallManagerNativeModule.stop();
     }
   },

package/dist/module/utils/internal/registerSDKGlobals.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","PermissionsAndroid","Platform","getCallingxLibIfAvailable","endCallingxCall","registerOutgoingCall","joinCallingxCall","StreamInCallManagerNativeModule","StreamInCallManager","StreamVideoReactNativeModule","StreamVideoReactNative","CallingxModule","shouldBypassForCallKit","isRingingTypeCall","OS","bypass","isSetup","isOngoingCallsEnabled","streamRNVideoSDKGlobals","callingX","joinCall","endCall","callManager","setup","defaultDevice","setDefaultAudioDeviceEndpointType","start","stop","permissions","check","permission","nativeAndroidPermission","PERMISSIONS","CAMERA","RECORD_AUDIO","Boolean","checkPermission","registerSDKGlobals","global","streamRNVideoSDK"],"sourceRoot":"../../../../src","sources":["utils/internal/registerSDKGlobals.ts"],"mappings":"AACA,SAASA,aAAa,EAAEC,kBAAkB,EAAEC,QAAQ,QAAQ,cAAc;AAC1E,SAASC,yBAAyB,QAAQ,uBAAuB;AACjE,SACEC,eAAe,EACfC,oBAAoB,EACpBC,gBAAgB,QACX,qBAAqB;AAE5B,MAAMC,+BAA+B,GAAGP,aAAa,CAACQ,mBAAmB;AACzE,MAAMC,4BAA4B,GAAGT,aAAa,CAACU,sBAElD;AAED,MAAMC,cAAc,GAAGR,yBAAyB,CAAC,CAAC;;AAElD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMS,sBAAsB,GAAGA,CAAC;EAC9BC;AAGF,CAAC,KAAc;EACb,IAAIX,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE;IACzB,OAAO,KAAK;EACd;EACA,IAAI,CAACH,cAAc,EAAE;IACnB,OAAO,KAAK;EACd;EACA,MAAMI,MAAM,GACVJ,cAAc,CAACK,OAAO,KACrBH,iBAAiB,IAAIF,cAAc,CAACM,qBAAqB,CAAC;EAC7D,OAAOF,MAAM;AACf,CAAC;AAED,MAAMG,uBAAgD,GAAG;EACvDC,QAAQ,EAAE;IACRC,QAAQ,EAAEd,gBAAgB;IAC1Be,OAAO,EAAEjB,eAAe;IACxBC,oBAAoB,EAAEA;EACxB,CAAC;EACDiB,WAAW,EAAE;IACXC,KAAK,EAAEA,CAAC;MAAEC,aAAa;MAAEX;IAAkB,CAAC,KAAK;MAC/C,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAN,+BAA+B,CAACkB,iCAAiC,CAC/DD,aACF,CAAC;MACDjB,+BAA+B,CAACgB,KAAK,CAAC,CAAC;IACzC,CAAC;IACDG,KAAK,EAAEA,CAAC;MAAEb;IAAkB,CAAC,KAAK;MAChC,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAN,+BAA+B,CAACmB,KAAK,CAAC,CAAC;IACzC,CAAC;IACDC,IAAI,EAAEA,CAAC;MAAEd;IAAkB,CAAC,KAAK;MAC/B,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAN,+BAA+B,CAACoB,IAAI,CAAC,CAAC;IACxC;EACF,CAAC;EACDC,WAAW,EAAE;IACXC,KAAK,EAAE,MAAOC,UAAU,IAAK;MAC3B,IAAI5B,QAAQ,CAACY,EAAE,KAAK,SAAS,EAAE;QAC7B,MAAMiB,uBAAuB,GAC3BD,UAAU,KAAK,QAAQ,GACnB7B,kBAAkB,CAAC+B,WAAW,CAACC,MAAM,GACrChC,kBAAkB,CAAC+B,WAAW,CAACE,YAAY;QACjD,OAAOjC,kBAAkB,CAAC4B,KAAK,CAACE,uBAAuB,CAAC;MAC1D;;MAEA;MACA,OAAOI,OAAO,CACZ,MAAM1B,4BAA4B,CAAC2B,eAAe,GAAGN,UAAU,CACjE,CAAC;IACH;EACF;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,SAASO,kBAAkBA,CAAA,EAAG;EACnC,IAAI,CAACC,MAAM,CAACC,gBAAgB,EAAE;IAC5BD,MAAM,CAACC,gBAAgB,GAAGrB,uBAAuB;EACnD;AACF","ignoreList":[]}
+{"version":3,"names":["NativeModules","PermissionsAndroid","Platform","StreamInCallManagerNativeModule","StreamInCallManager","StreamVideoReactNativeModule","StreamVideoReactNative","streamRNVideoSDKGlobals","callManager","setup","defaultDevice","setDefaultAudioDeviceEndpointType","start","stop","permissions","check","permission","OS","nativeAndroidPermission","PERMISSIONS","CAMERA","RECORD_AUDIO","Boolean","checkPermission","registerSDKGlobals","global","streamRNVideoSDK"],"sourceRoot":"../../../../src","sources":["utils/internal/registerSDKGlobals.ts"],"mappings":"AACA,SAASA,aAAa,EAAEC,kBAAkB,EAAEC,QAAQ,QAAQ,cAAc;AAE1E,MAAMC,+BAA+B,GAAGH,aAAa,CAACI,mBAAmB;AACzE,MAAMC,4BAA4B,GAAGL,aAAa,CAACM,sBAElD;AAED,MAAMC,uBAAgD,GAAG;EACvDC,WAAW,EAAE;IACXC,KAAK,EAAEA,CAAC;MAAEC;IAAc,CAAC,KAAK;MAC5BP,+BAA+B,CAACQ,iCAAiC,CAC/DD,aACF,CAAC;MACDP,+BAA+B,CAACM,KAAK,CAAC,CAAC;IACzC,CAAC;IACDG,KAAK,EAAEA,CAAA,KAAM;MACXT,+BAA+B,CAACS,KAAK,CAAC,CAAC;IACzC,CAAC;IACDC,IAAI,EAAEA,CAAA,KAAM;MACVV,+BAA+B,CAACU,IAAI,CAAC,CAAC;IACxC;EACF,CAAC;EACDC,WAAW,EAAE;IACXC,KAAK,EAAE,MAAOC,UAAU,IAAK;MAC3B,IAAId,QAAQ,CAACe,EAAE,KAAK,SAAS,EAAE;QAC7B,MAAMC,uBAAuB,GAC3BF,UAAU,KAAK,QAAQ,GACnBf,kBAAkB,CAACkB,WAAW,CAACC,MAAM,GACrCnB,kBAAkB,CAACkB,WAAW,CAACE,YAAY;QACjD,OAAOpB,kBAAkB,CAACc,KAAK,CAACG,uBAAuB,CAAC;MAC1D;;MAEA;MACA,OAAOI,OAAO,CACZ,MAAMjB,4BAA4B,CAACkB,eAAe,GAAGP,UAAU,CACjE,CAAC;IACH;EACF;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,SAASQ,kBAAkBA,CAAA,EAAG;EACnC,IAAI,CAACC,MAAM,CAACC,gBAAgB,EAAE;IAC5BD,MAAM,CAACC,gBAAgB,GAAGnB,uBAAuB;EACnD;AACF","ignoreList":[]}

package/dist/module/utils/push/android.js

@@ -1,12 +1,14 @@
 import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
 import { AppState, Platform } from 'react-native';
-import { getExpoNotificationsLib, getExpoNotificationsLibNoThrow, getFirebaseMessagingLib, getFirebaseMessagingLibNoThrow, getNotifeeLibThrowIfNotInstalledForPush } from './libs';
-import { pushNonRingingCallData$ } from './internal/rxSubjects';
+import { getExpoNotificationsLib, getExpoNotificationsLibNoThrow, getFirebaseMessagingLib, getFirebaseMessagingLibNoThrow, getIncomingCallForegroundServiceTypes, getNotifeeLibThrowIfNotInstalledForPush } from './libs';
+import { pushAcceptedIncomingCallCId$, pushAndroidBackgroundDeliveredIncomingCallCId$, pushNonRingingCallData$, pushRejectedIncomingCallCId$, pushTappedIncomingCallCId$ } from './internal/rxSubjects';
 import { pushUnsubscriptionCallbacks } from './internal/constants';
-import { canListenToWS, shouldCallBeClosed } from './internal/utils';
+import { canAddPushWSSubscriptionsRef, clearPushWSEventSubscriptions, processCallFromPushInBackground, shouldCallBeEnded } from './internal/utils';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
+import { getAndroidDefaultRingtoneUrl } from '../getAndroidDefaultRingtoneUrl';
 import { StreamVideoRN } from '../StreamVideoRN';
-import { getCallingxLib } from './libs/callingx';
+const ACCEPT_CALL_ACTION_ID = 'accept';
+const DECLINE_CALL_ACTION_ID = 'decline';
 let lastFirebaseToken = {
   token: '',
   userId: ''
@@ -61,7 +63,8 @@ export async function initAndroidPushToken(client, pushConfig, setUnsubscribeLis
       await setDeviceToken(token);
     }
   }
-  const messaging = pushConfig.isExpo ? getFirebaseMessagingLibNoThrow(true) : getFirebaseMessagingLib();
+  // TODO: remove the incomingCallChannel check and find a better way once we have telecom integration for android
+  const messaging = pushConfig.isExpo && !pushConfig.android.incomingCallChannel ? getFirebaseMessagingLibNoThrow(true) : getFirebaseMessagingLib();
   if (messaging) {
     logger.debug(`setting firebase token listeners`);
     const unsubscribe = messaging().onTokenRefresh(refreshedToken => setDeviceToken(refreshedToken));
@@ -75,8 +78,8 @@ export async function initAndroidPushToken(client, pushConfig, setUnsubscribeLis
  * Creates notification from the push message data.
  * For Ringing and Non-Ringing calls.
  */
-
 export const firebaseDataHandler = async data => {
+  if (Platform.OS !== 'android') return;
   /* Example data from firebase
     "message": {
         "data": {
@@ -92,155 +95,174 @@ export const firebaseDataHandler = async data => {
         // other stuff
     }
   */
-  if (Platform.OS !== 'android') return;
-  const logger = videoLoggerSystem.getLogger('firebaseDataHandler');
   const pushConfig = StreamVideoRN.getConfig().push;
   if (!pushConfig || !data || data.sender !== 'stream.video') {
     return;
   }
+  const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+  const notifee = notifeeLib.default;
+  const settings = await notifee.getNotificationSettings();
+  if (settings.authorizationStatus !== 1) {
+    const logger = videoLoggerSystem.getLogger('firebaseDataHandler');
+    logger.debug(`Notification permission not granted, unable to post ${data.type} notifications`);
+    return;
+  }
   if (data.type === 'call.ring') {
     const call_cid = data.call_cid;
-    const callingx = getCallingxLib();
-    const client = await pushConfig.createStreamVideoClient();
-    if (!client) {
-      logger.debug(`video client not found, skipping the call.ring notification`);
-      await callingx.stopService();
-      return;
-    }
+    const created_by_id = data.created_by_id;
+    const receiver_id = data.receiver_id;
+    const video_client = await pushConfig.createStreamVideoClient();
+    await video_client?.onRingingCall(call_cid);
+    const shouldCallBeClosed = callToCheck => {
+      const {
+        mustEndCall
+      } = shouldCallBeEnded(callToCheck, created_by_id, receiver_id);
+      return mustEndCall;
+    };
+    const canListenToWS = () => canAddPushWSSubscriptionsRef.current && AppState.currentState !== 'active';
     const asForegroundService = canListenToWS();
     if (asForegroundService) {
       // Listen to call events from WS through fg service
       // note: this will replace the current empty fg service runner
-      //we need to start service (e.g. by calling display incoming call) and than launch bg task, consider making those steps independent
-      await callingx.startBackgroundTask((_, stopTask) => {
-        return new Promise(resolve => {
-          const finishBackgroundTask = () => {
-            callingx.log(`Finishing background task for callCid: ${call_cid}`, 'debug');
-            resolve(undefined);
-            stopTask();
-          };
-          (async () => {
-            try {
-              const _client = await pushConfig.createStreamVideoClient();
-              if (!_client) {
-                logger.debug(`Closing fg service as there is no client to create from push config`);
-                finishBackgroundTask();
-                return;
-              }
-              const callFromPush = await _client.onRingingCall(call_cid);
-              const {
-                mustEndCall,
-                endCallReason
-              } = shouldCallBeClosed(callFromPush, data);
-              if (mustEndCall) {
-                logger.debug(`Closing fg service callCid: ${call_cid} endCallReason: ${endCallReason}`);
-                callingx.log(`Ending call with callCid: ${call_cid} endCallReason: ${endCallReason}`, 'debug');
-                callingx.endCallWithReason(call_cid, endCallReason);
-                resolve(undefined);
-                return;
-              }
-              const unsubscribeFunctions = [];
-              // check if service needs to be closed if accept/decline event was done on another device
-              const unsubscribe = callFromPush.on('all', event => {
-                const _canListenToWS = canListenToWS();
-                if (!_canListenToWS) {
-                  logger.debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, {
-                    event
-                  });
-                  unsubscribeFunctions.forEach(fn => fn());
-                  finishBackgroundTask();
-                  return;
-                }
-                const {
-                  mustEndCall: mustEndCallFromEvent,
-                  endCallReason: endCallReasonFromEvent
-                } = shouldCallBeClosed(callFromPush, data);
-                if (mustEndCallFromEvent) {
-                  logger.debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS} shouldCallBeClosed`, {
-                    event
-                  });
-                  unsubscribeFunctions.forEach(fn => fn());
-                  callingx.endCallWithReason(call_cid, endCallReasonFromEvent);
-                  resolve(undefined);
-                }
+      notifee.registerForegroundService(() => {
+        return new Promise(async () => {
+          const client = await pushConfig.createStreamVideoClient();
+          if (!client) {
+            videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Closing fg service as there is no client to create from push config`);
+            notifee.stopForegroundService();
+            return;
+          }
+          const callFromPush = await client.onRingingCall(call_cid);
+          let _shouldCallBeClosed = shouldCallBeClosed(callFromPush);
+          if (_shouldCallBeClosed) {
+            videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Closing fg service callCid: ${call_cid} shouldCallBeClosed: ${_shouldCallBeClosed}`);
+            notifee.stopForegroundService();
+            return;
+          }
+          const unsubscribeFunctions = [];
+          // check if service needs to be closed if accept/decline event was done on another device
+          const unsubscribe = callFromPush.on('all', event => {
+            const _canListenToWS = canListenToWS();
+            if (!_canListenToWS) {
+              videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, {
+                event
               });
-
-              // check if service needs to be closed if call was left
-              const stateSubscription = callFromPush.state.callingState$.subscribe(callingState => {
-                if (callingState === CallingState.IDLE || callingState === CallingState.LEFT) {
-                  logger.debug(`Closing fg service from callingState callCid: ${call_cid} callingState: ${callingState}`);
-                  unsubscribeFunctions.forEach(fn => fn());
-                  callingx.log(`Ending call with callCid: ${call_cid} callingState: ${callingState}`, 'debug');
-                  resolve(undefined);
-                }
-              });
-              const endCallSubscription = callingx.addEventListener('endCall', async ({
-                callId
-              }) => {
-                unsubscribeFunctions.forEach(fn => fn());
-                try {
-                  await callFromPush.leave({
-                    reject: callFromPush.state.callingState === CallingState.RINGING,
-                    reason: 'decline'
-                  });
-                } catch (error) {
-                  logger.error(`Failed to leave call with callCid: ${call_cid} error: ${error}`);
-                } finally {
-                  callingx.log(`Ending call with callCid: ${call_cid} callId: ${callId}`, 'debug');
-                  resolve(undefined);
-                }
-              });
-
-              //stop background task when app comes to foreground
-              const appStateSubscription = AppState.addEventListener('change', nextAppState => {
-                const _canListenToWS = canListenToWS();
-                callingx.log(`AppState changed to: ${nextAppState} for callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, 'debug');
-                if (!_canListenToWS) {
-                  unsubscribeFunctions.forEach(fn => fn());
-                  finishBackgroundTask();
-                  return;
-                }
+              unsubscribeFunctions.forEach(fn => fn());
+              notifee.stopForegroundService();
+              return;
+            }
+            _shouldCallBeClosed = shouldCallBeClosed(callFromPush);
+            if (_shouldCallBeClosed) {
+              videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS} shouldCallBeClosed: ${_shouldCallBeClosed}`, {
+                event
               });
-              unsubscribeFunctions.push(unsubscribe);
-              unsubscribeFunctions.push(() => stateSubscription.unsubscribe());
-              unsubscribeFunctions.push(() => endCallSubscription.remove());
-              unsubscribeFunctions.push(() => appStateSubscription.remove());
-              pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
-              pushUnsubscriptionCallbacks.set(call_cid, unsubscribeFunctions);
-            } catch (error) {
-              callingx.log(`Failed to start background task with callCid: ${call_cid} error: ${error}`, 'error');
-              finishBackgroundTask();
+              unsubscribeFunctions.forEach(fn => fn());
+              notifee.stopForegroundService();
+            }
+          });
+          // check if service needs to be closed if call was left
+          const subscription = callFromPush.state.callingState$.subscribe(callingState => {
+            if (callingState === CallingState.IDLE || callingState === CallingState.LEFT) {
+              videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Closing fg service from callingState callCid: ${call_cid} callingState: ${callingState}`);
+              unsubscribeFunctions.forEach(fn => fn());
+              notifee.stopForegroundService();
             }
-          })();
+          });
+          unsubscribeFunctions.push(unsubscribe);
+          unsubscribeFunctions.push(() => subscription.unsubscribe());
+          pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
+          pushUnsubscriptionCallbacks.set(call_cid, unsubscribeFunctions);
         });
       });
     }
+    const incomingCallChannel = pushConfig.android.incomingCallChannel;
+    const incomingCallNotificationTextGetters = pushConfig.android.incomingCallNotificationTextGetters;
+    if (!incomingCallChannel || !incomingCallNotificationTextGetters) {
+      const logger = videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler');
+      logger.error("Can't show incoming call notification as either or both incomingCallChannel and incomingCallNotificationTextGetters were not provided");
+      return;
+    }
+    /*
+     * Sound has to be set on channel level for android 8 and above and cant be updated later after creation!
+     * For android 7 and below, sound should be set on notification level
+     */
+    // set default ringtone if not provided
+    if (!incomingCallChannel.sound) {
+      incomingCallChannel.sound = await getAndroidDefaultRingtoneUrl();
+    }
+    await notifee.createChannel(incomingCallChannel);
+    const {
+      getTitle,
+      getBody,
+      getAcceptButtonTitle,
+      getDeclineButtonTitle
+    } = incomingCallNotificationTextGetters;
+    const createdUserName = data.created_by_display_name;
+    const title = getTitle(createdUserName);
+    const body = getBody(createdUserName);
+    videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Displaying incoming call notification with callCid: ${call_cid} title: ${title} body: ${body} asForegroundService: ${asForegroundService}`);
+    const channelId = incomingCallChannel.id;
+    await notifee.displayNotification({
+      id: call_cid,
+      title: getTitle(createdUserName),
+      body: getBody(createdUserName),
+      data,
+      android: {
+        channelId,
+        smallIcon: pushConfig.android.smallIcon,
+        importance: 4,
+        // high importance
+        foregroundServiceTypes: getIncomingCallForegroundServiceTypes(),
+        asForegroundService,
+        ongoing: true,
+        sound: incomingCallChannel.sound,
+        vibrationPattern: incomingCallChannel.vibrationPattern,
+        loopSound: true,
+        pressAction: {
+          id: 'default',
+          launchActivity: 'default' // open the app when the notification is pressed
+        },
+        actions: [{
+          title: getDeclineButtonTitle?.() ?? 'Decline',
+          pressAction: {
+            id: DECLINE_CALL_ACTION_ID
+          }
+        }, {
+          title: getAcceptButtonTitle?.() ?? 'Accept',
+          pressAction: {
+            id: ACCEPT_CALL_ACTION_ID,
+            launchActivity: 'default' // open the app when the notification is pressed
+          }
+        }],
+        category: notifeeLib.AndroidCategory.CALL,
+        fullScreenAction: {
+          id: 'stream_ringing_incoming_call'
+        },
+        timeoutAfter: 60000 // 60 seconds, after which the notification will be dismissed automatically
+      }
+    });
     if (asForegroundService) {
       // no need to check if call has be closed as that will be handled by the fg service
       return;
     }
+
+    // check if call needs to be closed if accept/decline event was done
+    // before the notification was shown
+    const client = await pushConfig.createStreamVideoClient();
+    if (!client) {
+      return;
+    }
     const callFromPush = await client.onRingingCall(call_cid);
-    const {
-      mustEndCall,
-      endCallReason
-    } = shouldCallBeClosed(callFromPush, data);
-    if (mustEndCall) {
-      logger.debug(`Removing incoming call notification immediately with callCid: ${call_cid} as it should be closed`);
-      callingx.endCallWithReason(call_cid, endCallReason);
+    if (shouldCallBeClosed(callFromPush)) {
+      videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Removing incoming call notification immediately with callCid: ${call_cid} as it should be closed`);
+      notifee.cancelDisplayedNotification(call_cid);
     }
   } else {
-    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
-    const notifee = notifeeLib.default;
-    const settings = await notifee.getNotificationSettings();
-    if (settings.authorizationStatus !== 1) {
-      logger.debug(`Notification permission not granted, unable to post ${data.type} notifications`);
-      return;
-    }
-
     // the other types are call.live_started and call.notification
     const callChannel = pushConfig.android.callChannel;
     const callNotificationTextGetters = pushConfig.android.callNotificationTextGetters;
     if (!callChannel || !callNotificationTextGetters) {
+      const logger = videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler');
       logger.debug("Can't show call notification as either or both callChannel and callNotificationTextGetters is not provided");
       return;
     }
@@ -255,10 +277,10 @@ export const firebaseDataHandler = async data => {
     const type = data.type;
     const title = getTitle(type, createdUserName);
     const body = getBody(type, createdUserName);
-    logger.debug(`Displaying NonRingingPushEvent ${type} notification with title: ${title} body: ${body}`);
+    videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler').debug(`Displaying NonRingingPushEvent ${type} notification with title: ${title} body: ${body}`);
     await notifee.displayNotification({
-      title,
-      body,
+      title: getTitle(type, createdUserName),
+      body: getBody(type, createdUserName),
       data,
       android: {
         sound: callChannel.sound,
@@ -282,7 +304,8 @@ export const firebaseDataHandler = async data => {
   }
 };
 export const onAndroidNotifeeEvent = async ({
-  event
+  event,
+  isBackground
 }) => {
   if (Platform.OS !== 'android') return;
   const {
@@ -290,7 +313,8 @@ export const onAndroidNotifeeEvent = async ({
     detail
   } = event;
   const {
-    notification
+    notification,
+    pressAction
   } = detail;
   const notificationId = notification?.id;
   const data = notification?.data;
@@ -301,10 +325,53 @@ export const onAndroidNotifeeEvent = async ({
 
   // we can safely cast to string because the data is from "stream.video"
   const call_cid = data.call_cid;
-  const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
-  if (type === notifeeLib.EventType.PRESS) {
-    videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`onTapNonRingingCallNotification with callCId: ${call_cid}`);
-    pushConfig.onTapNonRingingCallNotification?.(call_cid, data.type);
+  if (data.type === 'call.ring') {
+    // check if we have observers for the call cid (this means the app is in the foreground state)
+    const hasObservers = pushAcceptedIncomingCallCId$.observed && pushRejectedIncomingCallCId$.observed;
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    const notifee = notifeeLib.default;
+    // Check if we need to decline the call
+    const didPressDecline = type === notifeeLib.EventType.ACTION_PRESS && pressAction?.id === DECLINE_CALL_ACTION_ID;
+    const didDismiss = type === notifeeLib.EventType.DISMISSED;
+    const mustDecline = didPressDecline || didDismiss;
+    // Check if we need to accept the call
+    const mustAccept = type === notifeeLib.EventType.ACTION_PRESS && pressAction?.id === ACCEPT_CALL_ACTION_ID;
+    if (mustAccept || mustDecline || type === notifeeLib.EventType.ACTION_PRESS) {
+      videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`clearPushWSEventSubscriptions for callCId: ${call_cid} mustAccept: ${mustAccept} mustDecline: ${mustDecline}`);
+      clearPushWSEventSubscriptions(call_cid);
+      notifee.stopForegroundService();
+    }
+    if (mustAccept) {
+      videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushAcceptedIncomingCallCId$ added with callCId: ${call_cid}`);
+      pushAcceptedIncomingCallCId$.next(call_cid);
+      // NOTE: accept will be handled by the app with rxjs observers as the app will go to foreground always
+    } else if (mustDecline) {
+      videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushRejectedIncomingCallCId$ added with callCId: ${call_cid}`);
+      pushRejectedIncomingCallCId$.next(call_cid);
+      if (hasObservers) {
+        // if we had observers we can return here as the observers will handle the call as the app is in the foreground state
+        videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`Skipped processCallFromPushInBackground for Declining call with callCId: ${call_cid} as the app is in the foreground state`);
+        return;
+      }
+      videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`start processCallFromPushInBackground - Declining call with callCId: ${call_cid}`);
+      await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
+    } else {
+      if (type === notifeeLib.EventType.PRESS) {
+        videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushTappedIncomingCallCId$ added with callCId: ${call_cid}`);
+        pushTappedIncomingCallCId$.next(call_cid);
+        // pressed state will be handled by the app with rxjs observers as the app will go to foreground always
+      } else if (isBackground && type === notifeeLib.EventType.DELIVERED) {
+        videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushAndroidBackgroundDeliveredIncomingCallCId$ added with callCId: ${call_cid}`);
+        pushAndroidBackgroundDeliveredIncomingCallCId$.next(call_cid);
+        // background delivered state will be handled by the app with rxjs observers as processing needs to happen only when app is opened
+      }
+    }
+  } else {
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    if (type === notifeeLib.EventType.PRESS) {
+      videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`onTapNonRingingCallNotification with callCId: ${call_cid}`);
+      pushConfig.onTapNonRingingCallNotification?.(call_cid, data.type);
+    }
   }
 };
 //# sourceMappingURL=android.js.map