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

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

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.StreamVideoRN = void 0;
 var _pushLogoutCallback = _interopRequireDefault(require("../internal/pushLogoutCallback"));
 var _newNotificationCallbacks = _interopRequireDefault(require("../internal/newNotificationCallbacks"));
+var _setupIosCallKeepEvents = require("../push/setupIosCallKeepEvents");
 var _setupIosVoipPushEvents = require("../push/setupIosVoipPushEvents");
-var _setupCallingExpEvents = require("../push/setupCallingExpEvents");
-var _callingx = require("../push/libs/callingx");
 var _reactNative = require("react-native");
-var _videoClient = require("@stream-io/video-client");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Utility type for deep partial
 
@@ -35,7 +33,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',
@@ -57,6 +58,15 @@ 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.
@@ -70,26 +80,7 @@ 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: (text: string) => text,
-   *     subtitleTransformer: (text: string) => text,
-   *   },
-   * };
-   * StreamVideoRN.setPushConfig(pushConfig, callingExpOptions);
+   * StreamVideoRN.setPushConfig(pushConfig);
    * AppRegistry.registerComponent('app', () => App);
    */
   static setPushConfig(pushConfig) {
@@ -97,16 +88,13 @@ class StreamVideoRN {
       // Ignoring this config as push config was already set
       return;
     }
-    this.config.push = pushConfig;
-    try {
-      const callingx = (0, _callingx.getCallingxLib)();
-      _videoClient.videoLoggerSystem.getLogger('StreamVideoRN.setPushConfig').info(JSON.stringify(this.config));
-      const options = (0, _callingx.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.`);
     }
-    (0, _setupCallingExpEvents.setupCallingExpEvents)(pushConfig);
+    this.config.push = pushConfig;
+    (0, _setupIosCallKeepEvents.setupIosCallKeepEvents)(pushConfig);
     (0, _setupIosVoipPushEvents.setupIosVoipPushEvents)(pushConfig);
   }
   static getConfig() {

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

@@ -1 +1 @@
-{"version":3,"names":["_pushLogoutCallback","_interopRequireDefault","require","_newNotificationCallbacks","_setupIosVoipPushEvents","_setupCallingExpEvents","_callingx","_reactNative","_videoClient","e","__esModule","default","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","getCallingxLib","videoLoggerSystem","getLogger","info","JSON","stringify","options","extractCallingExpOptions","setup","Error","setupCallingExpEvents","setupIosVoipPushEvents","getConfig","onPushLogout","pushLogoutCallbacks","current","all","map","callback","then","resolve","clearPushLogoutCallbacks","addOnNewCallNotificationListener","newNotificationCallbacks","filter","cb","playBusyTone","NativeModules","StreamVideoReactNative","stopBusyTone","androidHasAudioOutputHardware","Platform","OS","hasAudioOutputHardware","androidHasMicrophoneHardware","hasMicrophoneHardware","androidHasCameraHardware","hasCameraHardware","exports"],"sourceRoot":"../../../../src","sources":["utils/StreamVideoRN/index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_pushLogoutCallback","_interopRequireDefault","require","_newNotificationCallbacks","_setupIosCallKeepEvents","_setupIosVoipPushEvents","_reactNative","e","__esModule","default","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","setupIosCallKeepEvents","setupIosVoipPushEvents","getConfig","onPushLogout","pushLogoutCallbacks","current","all","map","callback","then","resolve","clearPushLogoutCallbacks","addOnNewCallNotificationListener","newNotificationCallbacks","filter","cb","playBusyTone","NativeModules","StreamVideoReactNative","stopBusyTone","androidHasAudioOutputHardware","Platform","OS","hasAudioOutputHardware","androidHasMicrophoneHardware","hasMicrophoneHardware","androidHasCameraHardware","hasCameraHardware","exports"],"sourceRoot":"../../../../src","sources":["utils/StreamVideoRN/index.ts"],"mappings":"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","ignoreList":[]}

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

@@ -5,69 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.registerSDKGlobals = registerSDKGlobals;
 var _reactNative = require("react-native");
-var _callingx = require("../push/libs/callingx");
-var _callingx2 = require("./callingx/callingx");
 const StreamInCallManagerNativeModule = _reactNative.NativeModules.StreamInCallManager;
 const StreamVideoReactNativeModule = _reactNative.NativeModules.StreamVideoReactNative;
-const CallingxModule = (0, _callingx.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 (_reactNative.Platform.OS !== 'ios') {
-    return false;
-  }
-  if (!CallingxModule) {
-    return false;
-  }
-  const bypass = CallingxModule.isSetup && (isRingingTypeCall || CallingxModule.isOngoingCallsEnabled);
-  return bypass;
-};
 const streamRNVideoSDKGlobals = {
-  callingX: {
-    startCall: _callingx2.startCallingxCall,
-    endCall: _callingx2.endCallingxCall
-  },
   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/commonjs/utils/internal/registerSDKGlobals.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_callingx","_callingx2","StreamInCallManagerNativeModule","NativeModules","StreamInCallManager","StreamVideoReactNativeModule","StreamVideoReactNative","CallingxModule","getCallingxLibIfAvailable","shouldBypassForCallKit","isRingingTypeCall","Platform","OS","bypass","isSetup","isOngoingCallsEnabled","streamRNVideoSDKGlobals","callingX","startCall","startCallingxCall","endCall","endCallingxCall","callManager","setup","defaultDevice","setDefaultAudioDeviceEndpointType","start","stop","permissions","check","permission","nativeAndroidPermission","PermissionsAndroid","PERMISSIONS","CAMERA","RECORD_AUDIO","Boolean","checkPermission","registerSDKGlobals","global","streamRNVideoSDK"],"sourceRoot":"../../../../src","sources":["utils/internal/registerSDKGlobals.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAEA,MAAMG,+BAA+B,GAAGC,0BAAa,CAACC,mBAAmB;AACzE,MAAMC,4BAA4B,GAAGF,0BAAa,CAACG,sBAElD;AAED,MAAMC,cAAc,GAAG,IAAAC,mCAAyB,EAAC,CAAC;;AAElD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,sBAAsB,GAAGA,CAAC;EAC9BC;AAGF,CAAC,KAAc;EACb,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;IACzB,OAAO,KAAK;EACd;EACA,IAAI,CAACL,cAAc,EAAE;IACnB,OAAO,KAAK;EACd;EACA,MAAMM,MAAM,GACVN,cAAc,CAACO,OAAO,KACrBJ,iBAAiB,IAAIH,cAAc,CAACQ,qBAAqB,CAAC;EAC7D,OAAOF,MAAM;AACf,CAAC;AAED,MAAMG,uBAAgD,GAAG;EACvDC,QAAQ,EAAE;IACRC,SAAS,EAAEC,4BAAiB;IAC5BC,OAAO,EAAEC;EACX,CAAC;EACDC,WAAW,EAAE;IACXC,KAAK,EAAEA,CAAC;MAAEC,aAAa;MAAEd;IAAkB,CAAC,KAAK;MAC/C,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAR,+BAA+B,CAACuB,iCAAiC,CAC/DD,aACF,CAAC;MACDtB,+BAA+B,CAACqB,KAAK,CAAC,CAAC;IACzC,CAAC;IACDG,KAAK,EAAEA,CAAC;MAAEhB;IAAkB,CAAC,KAAK;MAChC,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAR,+BAA+B,CAACwB,KAAK,CAAC,CAAC;IACzC,CAAC;IACDC,IAAI,EAAEA,CAAC;MAAEjB;IAAkB,CAAC,KAAK;MAC/B,IAAID,sBAAsB,CAAC;QAAEC;MAAkB,CAAC,CAAC,EAAE;QACjD;MACF;MACAR,+BAA+B,CAACyB,IAAI,CAAC,CAAC;IACxC;EACF,CAAC;EACDC,WAAW,EAAE;IACXC,KAAK,EAAE,MAAOC,UAAU,IAAK;MAC3B,IAAInB,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;QAC7B,MAAMmB,uBAAuB,GAC3BD,UAAU,KAAK,QAAQ,GACnBE,+BAAkB,CAACC,WAAW,CAACC,MAAM,GACrCF,+BAAkB,CAACC,WAAW,CAACE,YAAY;QACjD,OAAOH,+BAAkB,CAACH,KAAK,CAACE,uBAAuB,CAAC;MAC1D;;MAEA;MACA,OAAOK,OAAO,CACZ,MAAM/B,4BAA4B,CAACgC,eAAe,GAAGP,UAAU,CACjE,CAAC;IACH;EACF;AACF,CAAC;;AAED;AACA;AACA;AACO,SAASQ,kBAAkBA,CAAA,EAAG;EACnC,IAAI,CAACC,MAAM,CAACC,gBAAgB,EAAE;IAC5BD,MAAM,CAACC,gBAAgB,GAAGxB,uBAAuB;EACnD;AACF","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","StreamInCallManagerNativeModule","NativeModules","StreamInCallManager","StreamVideoReactNativeModule","StreamVideoReactNative","streamRNVideoSDKGlobals","callManager","setup","defaultDevice","setDefaultAudioDeviceEndpointType","start","stop","permissions","check","permission","Platform","OS","nativeAndroidPermission","PermissionsAndroid","PERMISSIONS","CAMERA","RECORD_AUDIO","Boolean","checkPermission","registerSDKGlobals","global","streamRNVideoSDK"],"sourceRoot":"../../../../src","sources":["utils/internal/registerSDKGlobals.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,+BAA+B,GAAGC,0BAAa,CAACC,mBAAmB;AACzE,MAAMC,4BAA4B,GAAGF,0BAAa,CAACG,sBAElD;AAED,MAAMC,uBAAgD,GAAG;EACvDC,WAAW,EAAE;IACXC,KAAK,EAAEA,CAAC;MAAEC;IAAc,CAAC,KAAK;MAC5BR,+BAA+B,CAACS,iCAAiC,CAC/DD,aACF,CAAC;MACDR,+BAA+B,CAACO,KAAK,CAAC,CAAC;IACzC,CAAC;IACDG,KAAK,EAAEA,CAAA,KAAM;MACXV,+BAA+B,CAACU,KAAK,CAAC,CAAC;IACzC,CAAC;IACDC,IAAI,EAAEA,CAAA,KAAM;MACVX,+BAA+B,CAACW,IAAI,CAAC,CAAC;IACxC;EACF,CAAC;EACDC,WAAW,EAAE;IACXC,KAAK,EAAE,MAAOC,UAAU,IAAK;MAC3B,IAAIC,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;QAC7B,MAAMC,uBAAuB,GAC3BH,UAAU,KAAK,QAAQ,GACnBI,+BAAkB,CAACC,WAAW,CAACC,MAAM,GACrCF,+BAAkB,CAACC,WAAW,CAACE,YAAY;QACjD,OAAOH,+BAAkB,CAACL,KAAK,CAACI,uBAAuB,CAAC;MAC1D;;MAEA;MACA,OAAOK,OAAO,CACZ,MAAMnB,4BAA4B,CAACoB,eAAe,GAAGT,UAAU,CACjE,CAAC;IACH;EACF;AACF,CAAC;;AAED;AACA;AACA;AACO,SAASU,kBAAkBA,CAAA,EAAG;EACnC,IAAI,CAACC,MAAM,CAACC,gBAAgB,EAAE;IAC5BD,MAAM,CAACC,gBAAgB,GAAGrB,uBAAuB;EACnD;AACF","ignoreList":[]}

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

@@ -13,8 +13,10 @@ var _rxSubjects = require("./internal/rxSubjects");
 var _constants = require("./internal/constants");
 var _utils = require("./internal/utils");
 var _pushLogoutCallback = require("../internal/pushLogoutCallback");
+var _getAndroidDefaultRingtoneUrl = require("../getAndroidDefaultRingtoneUrl");
 var _StreamVideoRN = require("../StreamVideoRN");
-var _callingx = require("./libs/callingx");
+const ACCEPT_CALL_ACTION_ID = 'accept';
+const DECLINE_CALL_ACTION_ID = 'decline';
 let lastFirebaseToken = {
   token: '',
   userId: ''
@@ -69,7 +71,8 @@ async function initAndroidPushToken(client, pushConfig, setUnsubscribeListener)
       await setDeviceToken(token);
     }
   }
-  const messaging = pushConfig.isExpo ? (0, _libs.getFirebaseMessagingLibNoThrow)(true) : (0, _libs.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 ? (0, _libs.getFirebaseMessagingLibNoThrow)(true) : (0, _libs.getFirebaseMessagingLib)();
   if (messaging) {
     logger.debug(`setting firebase token listeners`);
     const unsubscribe = messaging().onTokenRefresh(refreshedToken => setDeviceToken(refreshedToken));
@@ -83,8 +86,8 @@ async function initAndroidPushToken(client, pushConfig, setUnsubscribeListener)
  * Creates notification from the push message data.
  * For Ringing and Non-Ringing calls.
  */
-
 const firebaseDataHandler = async data => {
+  if (_reactNative.Platform.OS !== 'android') return;
   /* Example data from firebase
     "message": {
         "data": {
@@ -100,171 +103,174 @@ const firebaseDataHandler = async data => {
         // other stuff
     }
   */
-  if (_reactNative.Platform.OS !== 'android') return;
-  const logger = _videoClient.videoLoggerSystem.getLogger('firebaseDataHandler');
   const pushConfig = _StreamVideoRN.StreamVideoRN.getConfig().push;
   if (!pushConfig || !data || data.sender !== 'stream.video') {
     return;
   }
+  const notifeeLib = (0, _libs.getNotifeeLibThrowIfNotInstalledForPush)();
+  const notifee = notifeeLib.default;
+  const settings = await notifee.getNotificationSettings();
+  if (settings.authorizationStatus !== 1) {
+    const logger = _videoClient.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;
-    if (!call_cid) {
-      logger.debug(`call_cid is not provided, skipping the call.ring notification`);
-      return;
-    }
-    const callingx = (0, _callingx.getCallingxLib)();
-    if (!callingx.canPostNotifications) {
-      logger.warn(`Cannot post notifications, skipping the call.ring notification`);
-      return;
-    }
-    const client = await pushConfig.createStreamVideoClient();
-    if (!client) {
-      logger.debug(`video client not found, skipping the call.ring notification`);
-      return;
-    }
-    const shouldRejectCallWhenBusy = client['rejectCallWhenBusy'] ?? false;
-    if (callingx.hasRegisteredCall() && shouldRejectCallWhenBusy) {
-      logger.debug(`registered call found, skipping the call.ring notification`);
-      return;
-    }
-    const asForegroundService = (0, _utils.canListenToWS)();
-    const callerName = data.created_by_display_name;
-    const hasVideo = data.video === 'true';
+    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
+      } = (0, _utils.shouldCallBeEnded)(callToCheck, created_by_id, receiver_id);
+      return mustEndCall;
+    };
+    const canListenToWS = () => _utils.canAddPushWSSubscriptionsRef.current && _reactNative.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
-      callingx.registerBackgroundTask((_, 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
-              } = (0, _utils.shouldCallBeClosed)(callFromPush, data);
-              if (mustEndCall) {
-                logger.debug(`Closing fg service callCid: ${call_cid} endCallReason: ${endCallReason}`);
-                finishBackgroundTask();
-                callingx.log(`Ending call with callCid: ${call_cid} endCallReason: ${endCallReason}`, 'debug');
-                callingx.endCallWithReason(call_cid, endCallReason);
-                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 = (0, _utils.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
-                } = (0, _utils.shouldCallBeClosed)(callFromPush, data);
-                if (mustEndCallFromEvent) {
-                  logger.debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS} shouldCallBeClosed`, {
-                    event
-                  });
-                  unsubscribeFunctions.forEach(fn => fn());
-                  finishBackgroundTask();
-                  callingx.endCallWithReason(call_cid, endCallReasonFromEvent);
-                }
+      notifee.registerForegroundService(() => {
+        return new Promise(async () => {
+          const client = await pushConfig.createStreamVideoClient();
+          if (!client) {
+            _videoClient.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) {
+            _videoClient.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) {
+              _videoClient.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 === _videoClient.CallingState.IDLE || callingState === _videoClient.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');
-                  finishBackgroundTask();
-                }
-              });
-              const endCallSubscription = callingx.addEventListener('endCall', async ({
-                callId
-              }) => {
-                unsubscribeFunctions.forEach(fn => fn());
-                try {
-                  await callFromPush.leave({
-                    reject: true,
-                    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');
-                  finishBackgroundTask();
-                }
-              });
-
-              //stop background task when app comes to foreground
-              const appStateSubscription = _reactNative.AppState.addEventListener('change', nextAppState => {
-                const _canListenToWS = (0, _utils.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) {
+              _videoClient.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());
-              _constants.pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
-              _constants.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 === _videoClient.CallingState.IDLE || callingState === _videoClient.CallingState.LEFT) {
+              _videoClient.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());
+          _constants.pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
+          _constants.pushUnsubscriptionCallbacks.set(call_cid, unsubscribeFunctions);
         });
       });
     }
-    await callingx.displayIncomingCall(call_cid, call_cid, callerName, hasVideo);
-    logger.debug(`Displaying incoming call notification with callCid: ${call_cid} asForegroundService: ${asForegroundService}`);
+    const incomingCallChannel = pushConfig.android.incomingCallChannel;
+    const incomingCallNotificationTextGetters = pushConfig.android.incomingCallNotificationTextGetters;
+    if (!incomingCallChannel || !incomingCallNotificationTextGetters) {
+      const logger = _videoClient.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 (0, _getAndroidDefaultRingtoneUrl.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);
+    _videoClient.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: (0, _libs.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
-    } = (0, _utils.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)) {
+      _videoClient.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 = (0, _libs.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 = _videoClient.videoLoggerSystem.getLogger('firebaseMessagingOnMessageHandler');
       logger.debug("Can't show call notification as either or both callChannel and callNotificationTextGetters is not provided");
       return;
     }
@@ -279,10 +285,10 @@ 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}`);
+    _videoClient.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,
@@ -307,7 +313,8 @@ const firebaseDataHandler = async data => {
 };
 exports.firebaseDataHandler = firebaseDataHandler;
 const onAndroidNotifeeEvent = async ({
-  event
+  event,
+  isBackground
 }) => {
   if (_reactNative.Platform.OS !== 'android') return;
   const {
@@ -315,7 +322,8 @@ const onAndroidNotifeeEvent = async ({
     detail
   } = event;
   const {
-    notification
+    notification,
+    pressAction
   } = detail;
   const notificationId = notification?.id;
   const data = notification?.data;
@@ -326,10 +334,53 @@ const onAndroidNotifeeEvent = async ({
 
   // we can safely cast to string because the data is from "stream.video"
   const call_cid = data.call_cid;
-  const notifeeLib = (0, _libs.getNotifeeLibThrowIfNotInstalledForPush)();
-  if (type === notifeeLib.EventType.PRESS) {
-    _videoClient.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 = _rxSubjects.pushAcceptedIncomingCallCId$.observed && _rxSubjects.pushRejectedIncomingCallCId$.observed;
+    const notifeeLib = (0, _libs.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) {
+      _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`clearPushWSEventSubscriptions for callCId: ${call_cid} mustAccept: ${mustAccept} mustDecline: ${mustDecline}`);
+      (0, _utils.clearPushWSEventSubscriptions)(call_cid);
+      notifee.stopForegroundService();
+    }
+    if (mustAccept) {
+      _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushAcceptedIncomingCallCId$ added with callCId: ${call_cid}`);
+      _rxSubjects.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) {
+      _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushRejectedIncomingCallCId$ added with callCId: ${call_cid}`);
+      _rxSubjects.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
+        _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`Skipped processCallFromPushInBackground for Declining call with callCId: ${call_cid} as the app is in the foreground state`);
+        return;
+      }
+      _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`start processCallFromPushInBackground - Declining call with callCId: ${call_cid}`);
+      await (0, _utils.processCallFromPushInBackground)(pushConfig, call_cid, 'decline');
+    } else {
+      if (type === notifeeLib.EventType.PRESS) {
+        _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushTappedIncomingCallCId$ added with callCId: ${call_cid}`);
+        _rxSubjects.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) {
+        _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`pushAndroidBackgroundDeliveredIncomingCallCId$ added with callCId: ${call_cid}`);
+        _rxSubjects.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 = (0, _libs.getNotifeeLibThrowIfNotInstalledForPush)();
+    if (type === notifeeLib.EventType.PRESS) {
+      _videoClient.videoLoggerSystem.getLogger('onAndroidNotifeeEvent').debug(`onTapNonRingingCallNotification with callCId: ${call_cid}`);
+      pushConfig.onTapNonRingingCallNotification?.(call_cid, data.type);
+    }
   }
 };
 exports.onAndroidNotifeeEvent = onAndroidNotifeeEvent;