@stream-io/video-react-native-sdk 1.6.0 → 1.6.1

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [1.6.1](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-1.6.0...@stream-io/video-react-native-sdk-1.6.1) (2025-01-06)
+
+
+* **rn-video:** upgrade to expo ver 52 ([#1630](https://github.com/GetStream/stream-video-js/issues/1630)) ([7eec9b0](https://github.com/GetStream/stream-video-js/commit/7eec9b0616a6c8f397a00d0c48da8932fd2b7dfc))
+
+
+### Bug Fixes
+
+*  foreground service cannot be started in background exception ([#1635](https://github.com/GetStream/stream-video-js/issues/1635)) ([bb82021](https://github.com/GetStream/stream-video-js/commit/bb820214b85e08c7be726e0da27b6739681e07e2))
+
 ## [1.6.0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-1.5.2...@stream-io/video-react-native-sdk-1.6.0) (2025-01-02)
 
 ### Dependency Updates

package/dist/commonjs/hooks/useAndroidKeepCallAliveEffect.js

@@ -10,6 +10,7 @@ var _utils = require("../utils");
 var _reactNative = require("react-native");
 var _videoClient = require("@stream-io/video-client");
 var _notifee = require("../utils/push/libs/notifee");
+var _hooks = require("../utils/hooks");
 const notifeeLib = (0, _notifee.getNotifeeLibNoThrowForKeepCallAlive)();
 function setForegroundService() {
   notifeeLib?.default.registerForegroundService(() => {
@@ -26,7 +27,7 @@ async function startForegroundService(call_cid) {
     body
   } = foregroundServiceConfig.android.notificationTexts;
 
-  // request for notification permission and then start the foreground service
+  // check for notification permission and then start the foreground service
   if (!notifeeLib) return;
   const settings = await notifeeLib.default.getNotificationSettings();
   if (settings.authorizationStatus !== notifeeLib.AuthorizationStatus.AUTHORIZED) {
@@ -71,11 +72,18 @@ const useAndroidKeepCallAliveEffect = () => {
     setForegroundService();
   }
   const foregroundServiceStartedRef = (0, _react.useRef)(false);
-  const activeCallCid = (0, _videoReactBindings.useCall)()?.cid;
+  const call = (0, _videoReactBindings.useCall)();
+  const activeCallCid = call?.cid;
   const {
     useCallCallingState
   } = (0, _videoReactBindings.useCallStateHooks)();
   const callingState = useCallCallingState();
+  const prevCallingState = (0, _hooks.usePrevious)(callingState);
+  const isStartingToJoin = prevCallingState === _videoClient.CallingState.IDLE && callingState === _videoClient.CallingState.JOINING;
+  const isStartingToJoinFromRinging = prevCallingState === _videoClient.CallingState.RINGING && callingState === _videoClient.CallingState.JOINING;
+  const isOutgoingCall = callingState === _videoClient.CallingState.RINGING && call?.isCreatedByMe;
+  const isCallJoined = callingState === _videoClient.CallingState.JOINED;
+  const shouldStartForegroundService = isStartingToJoin || isStartingToJoinFromRinging || isOutgoingCall || isCallJoined;
   (0, _react.useEffect)(() => {
     if (_reactNative.Platform.OS === 'ios' || !activeCallCid) {
       return;
@@ -83,30 +91,29 @@ const useAndroidKeepCallAliveEffect = () => {
     if (!notifeeLib) return;
 
     // start foreground service as soon as the call is joined
-    if (callingState === _videoClient.CallingState.JOINED) {
+    if (shouldStartForegroundService) {
       const run = async () => {
         if (foregroundServiceStartedRef.current) {
           return;
         }
         const notifee = notifeeLib.default;
-        notifee.getDisplayedNotifications().then(displayedNotifications => {
-          const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
-          if (activeCallNotification) {
-            // this means that we have a incoming call notification shown as foreground service and we must stop it
-            notifee.stopForegroundService();
-            notifee.cancelDisplayedNotification(activeCallCid);
-          }
-          // request for notification permission and then start the foreground service
-          startForegroundService(activeCallCid).then(() => {
-            foregroundServiceStartedRef.current = true;
-          });
+        const displayedNotifications = await notifee.getDisplayedNotifications();
+        const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
+        if (activeCallNotification) {
+          // this means that we have a incoming call notification shown as foreground service and we must stop it
+          notifee.stopForegroundService();
+          notifee.cancelDisplayedNotification(activeCallCid);
+        }
+        // check for notification permission and then start the foreground service
+        startForegroundService(activeCallCid).then(() => {
+          foregroundServiceStartedRef.current = true;
         });
       };
       run();
     } else if (callingState === _videoClient.CallingState.RINGING) {
-      // cancel any notifee displayed notification when the call has transitioned out of ringing
       return () => {
-        // cancels the non fg service notifications
+        // cancel any notifee displayed notification when the call has transitioned out of ringing
+        // NOTE: cancels only the non fg service notifications
         notifeeLib.default.cancelDisplayedNotification(activeCallCid);
       };
     } else if (callingState === _videoClient.CallingState.IDLE || callingState === _videoClient.CallingState.LEFT) {
@@ -124,7 +131,7 @@ const useAndroidKeepCallAliveEffect = () => {
         });
       }
     }
-  }, [activeCallCid, callingState]);
+  }, [activeCallCid, callingState, shouldStartForegroundService]);
   (0, _react.useEffect)(() => {
     return () => {
       // stop foreground service when this effect is unmounted

package/dist/commonjs/hooks/useAndroidKeepCallAliveEffect.js.map

@@ -1 +1 @@
-{"version":3,"names":["_videoReactBindings","require","_react","_utils","_reactNative","_videoClient","_notifee","notifeeLib","getNotifeeLibNoThrowForKeepCallAlive","setForegroundService","default","registerForegroundService","Promise","logger","getLogger","startForegroundService","call_cid","foregroundServiceConfig","StreamVideoRN","getConfig","foregroundService","title","body","android","notificationTexts","settings","getNotificationSettings","authorizationStatus","AuthorizationStatus","AUTHORIZED","channelId","channel","id","createChannel","foregroundServiceTypes","getKeepCallAliveForegroundServiceTypes","displayNotification","asForegroundService","ongoing","colorized","pressAction","launchActivity","isSetForegroundServiceRan","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","useRef","activeCallCid","useCall","cid","useCallCallingState","useCallStateHooks","callingState","useEffect","Platform","OS","CallingState","JOINED","run","current","notifee","getDisplayedNotifications","then","displayedNotifications","activeCallNotification","find","notification","stopForegroundService","cancelDisplayedNotification","RINGING","IDLE","LEFT","exports"],"sourceRoot":"../../../src","sources":["hooks/useAndroidKeepCallAliveEffect.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_videoReactBindings","require","_react","_utils","_reactNative","_videoClient","_notifee","_hooks","notifeeLib","getNotifeeLibNoThrowForKeepCallAlive","setForegroundService","default","registerForegroundService","Promise","logger","getLogger","startForegroundService","call_cid","foregroundServiceConfig","StreamVideoRN","getConfig","foregroundService","title","body","android","notificationTexts","settings","getNotificationSettings","authorizationStatus","AuthorizationStatus","AUTHORIZED","channelId","channel","id","createChannel","foregroundServiceTypes","getKeepCallAliveForegroundServiceTypes","displayNotification","asForegroundService","ongoing","colorized","pressAction","launchActivity","isSetForegroundServiceRan","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","useRef","call","useCall","activeCallCid","cid","useCallCallingState","useCallStateHooks","callingState","prevCallingState","usePrevious","isStartingToJoin","CallingState","IDLE","JOINING","isStartingToJoinFromRinging","RINGING","isOutgoingCall","isCreatedByMe","isCallJoined","JOINED","shouldStartForegroundService","useEffect","Platform","OS","run","current","notifee","displayedNotifications","getDisplayedNotifications","activeCallNotification","find","notification","stopForegroundService","cancelDisplayedNotification","then","LEFT","exports"],"sourceRoot":"../../../src","sources":["hooks/useAndroidKeepCallAliveEffect.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/utils/hooks/usePrevious.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","usePrevious","value","valueRef","useRef","useEffect","current","exports"],"sourceRoot":"../../../../src","sources":["utils/hooks/usePrevious.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEO,MAAMC,WAAW,GAAIC,KAAU,IAAK;EACzC,MAAMC,QAAQ,GAAG,IAAAC,aAAM,EAACF,KAAK,CAAC;EAE9B,IAAAG,gBAAS,EAAC,MAAM;IACdF,QAAQ,CAACG,OAAO,GAAGJ,KAAK;EAC1B,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAEX,OAAOC,QAAQ,CAACG,OAAO;AACzB,CAAC;AAACC,OAAA,CAAAN,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","usePrevious","value","valueRef","useRef","useEffect","current","exports"],"sourceRoot":"../../../../src","sources":["utils/hooks/usePrevious.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEO,MAAMC,WAAW,GAAOC,KAAQ,IAAK;EAC1C,MAAMC,QAAQ,GAAG,IAAAC,aAAM,EAACF,KAAK,CAAC;EAE9B,IAAAG,gBAAS,EAAC,MAAM;IACdF,QAAQ,CAACG,OAAO,GAAGJ,KAAK;EAC1B,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAEX,OAAOC,QAAQ,CAACG,OAAO;AACzB,CAAC;AAACC,OAAA,CAAAN,WAAA,GAAAA,WAAA","ignoreList":[]}

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

@@ -33,8 +33,9 @@ function processNonRingingNotificationStreamPayload(streamPayload) {
 const oniOSExpoNotificationEvent = event => {
   const pushConfig = _StreamVideoRN.StreamVideoRN.getConfig().push;
   if (pushConfig) {
-    if (event.request.trigger.type === 'push') {
-      const streamPayload = event.request.trigger.payload?.stream;
+    const trigger = event.request.trigger;
+    if (trigger && typeof trigger === 'object' && 'type' in trigger && trigger.type === 'push' && trigger.payload?.stream) {
+      const streamPayload = trigger.payload.stream;
       processNonRingingNotificationStreamPayload(streamPayload);
     }
   }

package/dist/commonjs/utils/push/ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_rxSubjects","_libs","_videoClient","_pushLogoutCallback","_StreamVideoRN","lastApnToken","token","userId","processNonRingingNotificationStreamPayload","streamPayload","sender","type","cid","call_cid","pushNonRingingCallData$","next","oniOSExpoNotificationEvent","event","pushConfig","StreamVideoRN","getConfig","push","request","trigger","payload","stream","exports","oniOSNotifeeEvent","Platform","OS","detail","notifeeLib","getNotifeeLibThrowIfNotInstalledForPush","EventType","PRESS","notification","data","result","onTapNonRingingCallNotification","onPushNotificationiOSStreamVideoEvent","pushNotificationIosLib","getPushNotificationIosLib","getData","isClicked","userInteraction","finish","FetchResult","NoData","initIosNonVoipToken","client","setUnsubscribeListener","ios","pushProviderName","setDeviceToken","streamClient","_user","id","setPushLogoutCallback","removeDevice","err","logger","getLogger","push_provider_name","addDevice","isExpo","expoNotificationsLib","getExpoNotificationsLib","getDevicePushTokenAsync","then","devicePushToken","subscription","addPushTokenListener","remove","addEventListener","removeEventListener"],"sourceRoot":"../../../../src","sources":["utils/push/ios.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_rxSubjects","_libs","_videoClient","_pushLogoutCallback","_StreamVideoRN","lastApnToken","token","userId","processNonRingingNotificationStreamPayload","streamPayload","sender","type","cid","call_cid","pushNonRingingCallData$","next","oniOSExpoNotificationEvent","event","pushConfig","StreamVideoRN","getConfig","push","trigger","request","payload","stream","exports","oniOSNotifeeEvent","Platform","OS","detail","notifeeLib","getNotifeeLibThrowIfNotInstalledForPush","EventType","PRESS","notification","data","result","onTapNonRingingCallNotification","onPushNotificationiOSStreamVideoEvent","pushNotificationIosLib","getPushNotificationIosLib","getData","isClicked","userInteraction","finish","FetchResult","NoData","initIosNonVoipToken","client","setUnsubscribeListener","ios","pushProviderName","setDeviceToken","streamClient","_user","id","setPushLogoutCallback","removeDevice","err","logger","getLogger","push_provider_name","addDevice","isExpo","expoNotificationsLib","getExpoNotificationsLib","getDevicePushTokenAsync","then","devicePushToken","subscription","addPushTokenListener","remove","addEventListener","removeEventListener"],"sourceRoot":"../../../../src","sources":["utils/push/ios.ts"],"mappings":"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","ignoreList":[]}

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

@@ -20,13 +20,15 @@ function isNotifeeStreamVideoEvent(event) {
   return notification?.data?.sender === 'stream.video';
 }
 function isExpoNotificationStreamVideoEvent(event) {
-  if (event.request.trigger.type === 'push') {
+  const trigger = event.request.trigger;
+  if (trigger && typeof trigger === 'object' && 'type' in trigger && trigger.type === 'push') {
     // iOS
-    const streamPayload = event.request.trigger.payload?.stream;
+    const streamPayload = trigger.payload?.stream;
     // Android
-    const remoteMessageData = event.request.trigger.remoteMessage?.data;
+    const remoteMessageData = trigger.remoteMessage?.data;
     return streamPayload?.sender === 'stream.video' || remoteMessageData?.sender === 'stream.video';
   }
+  return false;
 }
 function isPushNotificationiOSStreamVideoEvent(notification) {
   const data = notification.getData();

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

@@ -1 +1 @@
-{"version":3,"names":["isFirebaseStreamVideoMessage","message","data","sender","isNotifeeStreamVideoEvent","event","detail","notification","isExpoNotificationStreamVideoEvent","request","trigger","type","streamPayload","payload","stream","remoteMessageData","remoteMessage","isPushNotificationiOSStreamVideoEvent","getData"],"sourceRoot":"../../../../src","sources":["utils/push/utils.ts"],"mappings":";;;;;;;;;AAcO,SAASA,4BAA4BA,CAC1CC,OAA6C,EAC7C;EACA,OAAOA,OAAO,CAACC,IAAI,EAAEC,MAAM,KAAK,cAAc;AAChD;AAEO,SAASC,yBAAyBA,CAACC,KAAY,EAAE;EACtD,MAAM;IAAEC;EAAO,CAAC,GAAGD,KAAK;EACxB,MAAM;IAAEE;EAAa,CAAC,GAAGD,MAAM;EAC/B,OAAOC,YAAY,EAAEL,IAAI,EAAEC,MAAM,KAAK,cAAc;AACtD;AAEO,SAASK,kCAAkCA,CAACH,KAAuB,EAAE;EAC1E,IAAIA,KAAK,CAACI,OAAO,CAACC,OAAO,CAACC,IAAI,KAAK,MAAM,EAAE;IACzC;IACA,MAAMC,aAAa,GAAGP,KAAK,CAACI,OAAO,CAACC,OAAO,CAACG,OAAO,EAC/CC,MAA2B;IAC/B;IACA,MAAMC,iBAAiB,GAAGV,KAAK,CAACI,OAAO,CAACC,OAAO,CAACM,aAAa,EAAEd,IAAI;IACnE,OACEU,aAAa,EAAET,MAAM,KAAK,cAAc,IACxCY,iBAAiB,EAAEZ,MAAM,KAAK,cAAc;EAEhD;AACF;AAEO,SAASc,qCAAqCA,CACnDV,YAAqC,EACrC;EACA,MAAML,IAAI,GAAGK,YAAY,CAACW,OAAO,CAAC,CAAC;EACnC,MAAMN,aAAa,GAAGV,IAAI,EAAEY,MAA2B;EACvD,OAAOF,aAAa,EAAET,MAAM,KAAK,cAAc;AACjD","ignoreList":[]}
+{"version":3,"names":["isFirebaseStreamVideoMessage","message","data","sender","isNotifeeStreamVideoEvent","event","detail","notification","isExpoNotificationStreamVideoEvent","trigger","request","type","streamPayload","payload","stream","remoteMessageData","remoteMessage","isPushNotificationiOSStreamVideoEvent","getData"],"sourceRoot":"../../../../src","sources":["utils/push/utils.ts"],"mappings":";;;;;;;;;AAcO,SAASA,4BAA4BA,CAC1CC,OAA6C,EAC7C;EACA,OAAOA,OAAO,CAACC,IAAI,EAAEC,MAAM,KAAK,cAAc;AAChD;AAEO,SAASC,yBAAyBA,CAACC,KAAY,EAAE;EACtD,MAAM;IAAEC;EAAO,CAAC,GAAGD,KAAK;EACxB,MAAM;IAAEE;EAAa,CAAC,GAAGD,MAAM;EAC/B,OAAOC,YAAY,EAAEL,IAAI,EAAEC,MAAM,KAAK,cAAc;AACtD;AAEO,SAASK,kCAAkCA,CAACH,KAAuB,EAAE;EAC1E,MAAMI,OAAO,GAAGJ,KAAK,CAACK,OAAO,CAACD,OAAO;EACrC,IACEA,OAAO,IACP,OAAOA,OAAO,KAAK,QAAQ,IAC3B,MAAM,IAAIA,OAAO,IACjBA,OAAO,CAACE,IAAI,KAAK,MAAM,EACvB;IACA;IACA,MAAMC,aAAa,GAAGH,OAAO,CAACI,OAAO,EAAEC,MAA2B;IAClE;IACA,MAAMC,iBAAiB,GAAGN,OAAO,CAACO,aAAa,EAAEd,IAAI;IACrD,OACEU,aAAa,EAAET,MAAM,KAAK,cAAc,IACxCY,iBAAiB,EAAEZ,MAAM,KAAK,cAAc;EAEhD;EACA,OAAO,KAAK;AACd;AAEO,SAASc,qCAAqCA,CACnDV,YAAqC,EACrC;EACA,MAAML,IAAI,GAAGK,YAAY,CAACW,OAAO,CAAC,CAAC;EACnC,MAAMN,aAAa,GAAGV,IAAI,EAAEY,MAA2B;EACvD,OAAOF,aAAa,EAAET,MAAM,KAAK,cAAc;AACjD","ignoreList":[]}

package/dist/commonjs/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-const version = exports.version = '1.6.0';
+const version = exports.version = '1.6.1';
 //# sourceMappingURL=version.js.map

package/dist/module/hooks/useAndroidKeepCallAliveEffect.js

@@ -4,6 +4,7 @@ import { StreamVideoRN } from '../utils';
 import { Platform } from 'react-native';
 import { CallingState, getLogger } from '@stream-io/video-client';
 import { getNotifeeLibNoThrowForKeepCallAlive, getKeepCallAliveForegroundServiceTypes } from '../utils/push/libs/notifee';
+import { usePrevious } from '../utils/hooks';
 const notifeeLib = getNotifeeLibNoThrowForKeepCallAlive();
 function setForegroundService() {
   notifeeLib?.default.registerForegroundService(() => {
@@ -20,7 +21,7 @@ async function startForegroundService(call_cid) {
     body
   } = foregroundServiceConfig.android.notificationTexts;
 
-  // request for notification permission and then start the foreground service
+  // check for notification permission and then start the foreground service
   if (!notifeeLib) return;
   const settings = await notifeeLib.default.getNotificationSettings();
   if (settings.authorizationStatus !== notifeeLib.AuthorizationStatus.AUTHORIZED) {
@@ -65,11 +66,18 @@ export const useAndroidKeepCallAliveEffect = () => {
     setForegroundService();
   }
   const foregroundServiceStartedRef = useRef(false);
-  const activeCallCid = useCall()?.cid;
+  const call = useCall();
+  const activeCallCid = call?.cid;
   const {
     useCallCallingState
   } = useCallStateHooks();
   const callingState = useCallCallingState();
+  const prevCallingState = usePrevious(callingState);
+  const isStartingToJoin = prevCallingState === CallingState.IDLE && callingState === CallingState.JOINING;
+  const isStartingToJoinFromRinging = prevCallingState === CallingState.RINGING && callingState === CallingState.JOINING;
+  const isOutgoingCall = callingState === CallingState.RINGING && call?.isCreatedByMe;
+  const isCallJoined = callingState === CallingState.JOINED;
+  const shouldStartForegroundService = isStartingToJoin || isStartingToJoinFromRinging || isOutgoingCall || isCallJoined;
   useEffect(() => {
     if (Platform.OS === 'ios' || !activeCallCid) {
       return;
@@ -77,30 +85,29 @@ export const useAndroidKeepCallAliveEffect = () => {
     if (!notifeeLib) return;
 
     // start foreground service as soon as the call is joined
-    if (callingState === CallingState.JOINED) {
+    if (shouldStartForegroundService) {
       const run = async () => {
         if (foregroundServiceStartedRef.current) {
           return;
         }
         const notifee = notifeeLib.default;
-        notifee.getDisplayedNotifications().then(displayedNotifications => {
-          const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
-          if (activeCallNotification) {
-            // this means that we have a incoming call notification shown as foreground service and we must stop it
-            notifee.stopForegroundService();
-            notifee.cancelDisplayedNotification(activeCallCid);
-          }
-          // request for notification permission and then start the foreground service
-          startForegroundService(activeCallCid).then(() => {
-            foregroundServiceStartedRef.current = true;
-          });
+        const displayedNotifications = await notifee.getDisplayedNotifications();
+        const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
+        if (activeCallNotification) {
+          // this means that we have a incoming call notification shown as foreground service and we must stop it
+          notifee.stopForegroundService();
+          notifee.cancelDisplayedNotification(activeCallCid);
+        }
+        // check for notification permission and then start the foreground service
+        startForegroundService(activeCallCid).then(() => {
+          foregroundServiceStartedRef.current = true;
         });
       };
       run();
     } else if (callingState === CallingState.RINGING) {
-      // cancel any notifee displayed notification when the call has transitioned out of ringing
       return () => {
-        // cancels the non fg service notifications
+        // cancel any notifee displayed notification when the call has transitioned out of ringing
+        // NOTE: cancels only the non fg service notifications
         notifeeLib.default.cancelDisplayedNotification(activeCallCid);
       };
     } else if (callingState === CallingState.IDLE || callingState === CallingState.LEFT) {
@@ -118,7 +125,7 @@ export const useAndroidKeepCallAliveEffect = () => {
         });
       }
     }
-  }, [activeCallCid, callingState]);
+  }, [activeCallCid, callingState, shouldStartForegroundService]);
   useEffect(() => {
     return () => {
       // stop foreground service when this effect is unmounted

package/dist/module/hooks/useAndroidKeepCallAliveEffect.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCall","useCallStateHooks","useEffect","useRef","StreamVideoRN","Platform","CallingState","getLogger","getNotifeeLibNoThrowForKeepCallAlive","getKeepCallAliveForegroundServiceTypes","notifeeLib","setForegroundService","default","registerForegroundService","Promise","logger","startForegroundService","call_cid","foregroundServiceConfig","getConfig","foregroundService","title","body","android","notificationTexts","settings","getNotificationSettings","authorizationStatus","AuthorizationStatus","AUTHORIZED","channelId","channel","id","createChannel","foregroundServiceTypes","displayNotification","asForegroundService","ongoing","colorized","pressAction","launchActivity","isSetForegroundServiceRan","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","activeCallCid","cid","useCallCallingState","callingState","OS","JOINED","run","current","notifee","getDisplayedNotifications","then","displayedNotifications","activeCallNotification","find","notification","stopForegroundService","cancelDisplayedNotification","RINGING","IDLE","LEFT"],"sourceRoot":"../../../src","sources":["hooks/useAndroidKeepCallAliveEffect.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCall","useCallStateHooks","useEffect","useRef","StreamVideoRN","Platform","CallingState","getLogger","getNotifeeLibNoThrowForKeepCallAlive","getKeepCallAliveForegroundServiceTypes","usePrevious","notifeeLib","setForegroundService","default","registerForegroundService","Promise","logger","startForegroundService","call_cid","foregroundServiceConfig","getConfig","foregroundService","title","body","android","notificationTexts","settings","getNotificationSettings","authorizationStatus","AuthorizationStatus","AUTHORIZED","channelId","channel","id","createChannel","foregroundServiceTypes","displayNotification","asForegroundService","ongoing","colorized","pressAction","launchActivity","isSetForegroundServiceRan","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","call","activeCallCid","cid","useCallCallingState","callingState","prevCallingState","isStartingToJoin","IDLE","JOINING","isStartingToJoinFromRinging","RINGING","isOutgoingCall","isCreatedByMe","isCallJoined","JOINED","shouldStartForegroundService","OS","run","current","notifee","displayedNotifications","getDisplayedNotifications","activeCallNotification","find","notification","stopForegroundService","cancelDisplayedNotification","then","LEFT"],"sourceRoot":"../../../src","sources":["hooks/useAndroidKeepCallAliveEffect.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/utils/hooks/usePrevious.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","usePrevious","value","valueRef","current"],"sourceRoot":"../../../../src","sources":["utils/hooks/usePrevious.ts"],"mappings":"AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEzC,OAAO,MAAMC,WAAW,GAAIC,KAAU,IAAK;EACzC,MAAMC,QAAQ,GAAGH,MAAM,CAACE,KAAK,CAAC;EAE9BH,SAAS,CAAC,MAAM;IACdI,QAAQ,CAACC,OAAO,GAAGF,KAAK;EAC1B,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAEX,OAAOC,QAAQ,CAACC,OAAO;AACzB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","usePrevious","value","valueRef","current"],"sourceRoot":"../../../../src","sources":["utils/hooks/usePrevious.ts"],"mappings":"AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEzC,OAAO,MAAMC,WAAW,GAAOC,KAAQ,IAAK;EAC1C,MAAMC,QAAQ,GAAGH,MAAM,CAACE,KAAK,CAAC;EAE9BH,SAAS,CAAC,MAAM;IACdI,QAAQ,CAACC,OAAO,GAAGF,KAAK;EAC1B,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAEX,OAAOC,QAAQ,CAACC,OAAO;AACzB,CAAC","ignoreList":[]}

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

@@ -25,8 +25,9 @@ function processNonRingingNotificationStreamPayload(streamPayload) {
 export const oniOSExpoNotificationEvent = event => {
   const pushConfig = StreamVideoRN.getConfig().push;
   if (pushConfig) {
-    if (event.request.trigger.type === 'push') {
-      const streamPayload = event.request.trigger.payload?.stream;
+    const trigger = event.request.trigger;
+    if (trigger && typeof trigger === 'object' && 'type' in trigger && trigger.type === 'push' && trigger.payload?.stream) {
+      const streamPayload = trigger.payload.stream;
       processNonRingingNotificationStreamPayload(streamPayload);
     }
   }

package/dist/module/utils/push/ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","pushNonRingingCallData$","getExpoNotificationsLib","getNotifeeLibThrowIfNotInstalledForPush","getPushNotificationIosLib","getLogger","setPushLogoutCallback","StreamVideoRN","lastApnToken","token","userId","processNonRingingNotificationStreamPayload","streamPayload","sender","type","cid","call_cid","next","oniOSExpoNotificationEvent","event","pushConfig","getConfig","push","request","trigger","payload","stream","oniOSNotifeeEvent","OS","detail","notifeeLib","EventType","PRESS","notification","data","result","onTapNonRingingCallNotification","onPushNotificationiOSStreamVideoEvent","pushNotificationIosLib","getData","isClicked","userInteraction","finish","FetchResult","NoData","initIosNonVoipToken","client","setUnsubscribeListener","ios","pushProviderName","setDeviceToken","streamClient","_user","id","removeDevice","err","logger","push_provider_name","addDevice","isExpo","expoNotificationsLib","getDevicePushTokenAsync","then","devicePushToken","subscription","addPushTokenListener","remove","addEventListener","removeEventListener"],"sourceRoot":"../../../../src","sources":["utils/push/ios.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Platform","pushNonRingingCallData$","getExpoNotificationsLib","getNotifeeLibThrowIfNotInstalledForPush","getPushNotificationIosLib","getLogger","setPushLogoutCallback","StreamVideoRN","lastApnToken","token","userId","processNonRingingNotificationStreamPayload","streamPayload","sender","type","cid","call_cid","next","oniOSExpoNotificationEvent","event","pushConfig","getConfig","push","trigger","request","payload","stream","oniOSNotifeeEvent","OS","detail","notifeeLib","EventType","PRESS","notification","data","result","onTapNonRingingCallNotification","onPushNotificationiOSStreamVideoEvent","pushNotificationIosLib","getData","isClicked","userInteraction","finish","FetchResult","NoData","initIosNonVoipToken","client","setUnsubscribeListener","ios","pushProviderName","setDeviceToken","streamClient","_user","id","removeDevice","err","logger","push_provider_name","addDevice","isExpo","expoNotificationsLib","getDevicePushTokenAsync","then","devicePushToken","subscription","addPushTokenListener","remove","addEventListener","removeEventListener"],"sourceRoot":"../../../../src","sources":["utils/push/ios.ts"],"mappings":"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","ignoreList":[]}

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

@@ -11,13 +11,15 @@ export function isNotifeeStreamVideoEvent(event) {
   return notification?.data?.sender === 'stream.video';
 }
 export function isExpoNotificationStreamVideoEvent(event) {
-  if (event.request.trigger.type === 'push') {
+  const trigger = event.request.trigger;
+  if (trigger && typeof trigger === 'object' && 'type' in trigger && trigger.type === 'push') {
     // iOS
-    const streamPayload = event.request.trigger.payload?.stream;
+    const streamPayload = trigger.payload?.stream;
     // Android
-    const remoteMessageData = event.request.trigger.remoteMessage?.data;
+    const remoteMessageData = trigger.remoteMessage?.data;
     return streamPayload?.sender === 'stream.video' || remoteMessageData?.sender === 'stream.video';
   }
+  return false;
 }
 export function isPushNotificationiOSStreamVideoEvent(notification) {
   const data = notification.getData();

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

@@ -1 +1 @@
-{"version":3,"names":["isFirebaseStreamVideoMessage","message","data","sender","isNotifeeStreamVideoEvent","event","detail","notification","isExpoNotificationStreamVideoEvent","request","trigger","type","streamPayload","payload","stream","remoteMessageData","remoteMessage","isPushNotificationiOSStreamVideoEvent","getData"],"sourceRoot":"../../../../src","sources":["utils/push/utils.ts"],"mappings":"AAcA,OAAO,SAASA,4BAA4BA,CAC1CC,OAA6C,EAC7C;EACA,OAAOA,OAAO,CAACC,IAAI,EAAEC,MAAM,KAAK,cAAc;AAChD;AAEA,OAAO,SAASC,yBAAyBA,CAACC,KAAY,EAAE;EACtD,MAAM;IAAEC;EAAO,CAAC,GAAGD,KAAK;EACxB,MAAM;IAAEE;EAAa,CAAC,GAAGD,MAAM;EAC/B,OAAOC,YAAY,EAAEL,IAAI,EAAEC,MAAM,KAAK,cAAc;AACtD;AAEA,OAAO,SAASK,kCAAkCA,CAACH,KAAuB,EAAE;EAC1E,IAAIA,KAAK,CAACI,OAAO,CAACC,OAAO,CAACC,IAAI,KAAK,MAAM,EAAE;IACzC;IACA,MAAMC,aAAa,GAAGP,KAAK,CAACI,OAAO,CAACC,OAAO,CAACG,OAAO,EAC/CC,MAA2B;IAC/B;IACA,MAAMC,iBAAiB,GAAGV,KAAK,CAACI,OAAO,CAACC,OAAO,CAACM,aAAa,EAAEd,IAAI;IACnE,OACEU,aAAa,EAAET,MAAM,KAAK,cAAc,IACxCY,iBAAiB,EAAEZ,MAAM,KAAK,cAAc;EAEhD;AACF;AAEA,OAAO,SAASc,qCAAqCA,CACnDV,YAAqC,EACrC;EACA,MAAML,IAAI,GAAGK,YAAY,CAACW,OAAO,CAAC,CAAC;EACnC,MAAMN,aAAa,GAAGV,IAAI,EAAEY,MAA2B;EACvD,OAAOF,aAAa,EAAET,MAAM,KAAK,cAAc;AACjD","ignoreList":[]}
+{"version":3,"names":["isFirebaseStreamVideoMessage","message","data","sender","isNotifeeStreamVideoEvent","event","detail","notification","isExpoNotificationStreamVideoEvent","trigger","request","type","streamPayload","payload","stream","remoteMessageData","remoteMessage","isPushNotificationiOSStreamVideoEvent","getData"],"sourceRoot":"../../../../src","sources":["utils/push/utils.ts"],"mappings":"AAcA,OAAO,SAASA,4BAA4BA,CAC1CC,OAA6C,EAC7C;EACA,OAAOA,OAAO,CAACC,IAAI,EAAEC,MAAM,KAAK,cAAc;AAChD;AAEA,OAAO,SAASC,yBAAyBA,CAACC,KAAY,EAAE;EACtD,MAAM;IAAEC;EAAO,CAAC,GAAGD,KAAK;EACxB,MAAM;IAAEE;EAAa,CAAC,GAAGD,MAAM;EAC/B,OAAOC,YAAY,EAAEL,IAAI,EAAEC,MAAM,KAAK,cAAc;AACtD;AAEA,OAAO,SAASK,kCAAkCA,CAACH,KAAuB,EAAE;EAC1E,MAAMI,OAAO,GAAGJ,KAAK,CAACK,OAAO,CAACD,OAAO;EACrC,IACEA,OAAO,IACP,OAAOA,OAAO,KAAK,QAAQ,IAC3B,MAAM,IAAIA,OAAO,IACjBA,OAAO,CAACE,IAAI,KAAK,MAAM,EACvB;IACA;IACA,MAAMC,aAAa,GAAGH,OAAO,CAACI,OAAO,EAAEC,MAA2B;IAClE;IACA,MAAMC,iBAAiB,GAAGN,OAAO,CAACO,aAAa,EAAEd,IAAI;IACrD,OACEU,aAAa,EAAET,MAAM,KAAK,cAAc,IACxCY,iBAAiB,EAAEZ,MAAM,KAAK,cAAc;EAEhD;EACA,OAAO,KAAK;AACd;AAEA,OAAO,SAASc,qCAAqCA,CACnDV,YAAqC,EACrC;EACA,MAAML,IAAI,GAAGK,YAAY,CAACW,OAAO,CAAC,CAAC;EACnC,MAAMN,aAAa,GAAGV,IAAI,EAAEY,MAA2B;EACvD,OAAOF,aAAa,EAAET,MAAM,KAAK,cAAc;AACjD","ignoreList":[]}

package/dist/module/version.js

@@ -1,2 +1,2 @@
-export const version = '1.6.0';
+export const version = '1.6.1';
 //# sourceMappingURL=version.js.map

package/dist/typescript/hooks/useAndroidKeepCallAliveEffect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAndroidKeepCallAliveEffect.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAndroidKeepCallAliveEffect.ts"],"names":[],"mappings":"AAgEA;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,YAgFzC,CAAC"}
+{"version":3,"file":"useAndroidKeepCallAliveEffect.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAndroidKeepCallAliveEffect.ts"],"names":[],"mappings":"AAiEA;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,YAmGzC,CAAC"}

package/dist/typescript/utils/hooks/usePrevious.d.ts

@@ -1,2 +1,2 @@
-export declare const usePrevious: (value: any) => any;
+export declare const usePrevious: <T>(value: T) => T;
 //# sourceMappingURL=usePrevious.d.ts.map

package/dist/typescript/utils/hooks/usePrevious.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePrevious.d.ts","sourceRoot":"","sources":["../../../../src/utils/hooks/usePrevious.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,UAAW,GAAG,QAQrC,CAAC"}
+{"version":3,"file":"usePrevious.d.ts","sourceRoot":"","sources":["../../../../src/utils/hooks/usePrevious.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,CAAC,MAQtC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/ios.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EACL,gBAAgB,EAIhB,uBAAuB,EACxB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAa,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAkBzD,eAAO,MAAM,0BAA0B,UAAW,gBAAgB,SASjE,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAE3B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,SAcA,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,QAiBtC;AAED,2BAA2B;AAC3B,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,UAAU,EACtB,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,IAAI,KAAK,IAAI,iBAiD1D"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/ios.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EACL,gBAAgB,EAIhB,uBAAuB,EACxB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAa,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAkBzD,eAAO,MAAM,0BAA0B,UAAW,gBAAgB,SAejE,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAE3B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,SAcA,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,QAiBtC;AAED,2BAA2B;AAC3B,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,UAAU,EACtB,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,IAAI,KAAK,IAAI,iBAiD1D"}

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

@@ -10,6 +10,6 @@ export type StreamPushPayload = {
 } | 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 isExpoNotificationStreamVideoEvent(event: ExpoNotification): boolean;
 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,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,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,WAkBzE;AAED,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,WAKtC"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.6.0";
+export declare const version = "1.6.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "packageManager": "yarn@3.2.4",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",
@@ -135,7 +135,7 @@
     "expo": "50.0.19",
     "expo-build-properties": "^0.12.3",
     "expo-modules-core": "1.12.16",
-    "expo-notifications": "~0.28.18",
+    "expo-notifications": "~0.29.11",
     "jest": "^29.7.0",
     "react-native": "0.71.8",
     "react-native-builder-bob": "^0.23.2",

package/src/hooks/useAndroidKeepCallAliveEffect.ts

@@ -7,6 +7,7 @@ import {
   getNotifeeLibNoThrowForKeepCallAlive,
   getKeepCallAliveForegroundServiceTypes,
 } from '../utils/push/libs/notifee';
+import { usePrevious } from '../utils/hooks';
 
 const notifeeLib = getNotifeeLibNoThrowForKeepCallAlive();
 
@@ -23,7 +24,7 @@ async function startForegroundService(call_cid: string) {
   const foregroundServiceConfig = StreamVideoRN.getConfig().foregroundService;
   const { title, body } = foregroundServiceConfig.android.notificationTexts;
 
-  // request for notification permission and then start the foreground service
+  // check for notification permission and then start the foreground service
   if (!notifeeLib) return;
   const settings = await notifeeLib.default.getNotificationSettings();
   if (
@@ -75,10 +76,29 @@ export const useAndroidKeepCallAliveEffect = () => {
   }
   const foregroundServiceStartedRef = useRef(false);
 
-  const activeCallCid = useCall()?.cid;
+  const call = useCall();
+  const activeCallCid = call?.cid;
   const { useCallCallingState } = useCallStateHooks();
   const callingState = useCallCallingState();
 
+  const prevCallingState = usePrevious(callingState);
+
+  const isStartingToJoin =
+    prevCallingState === CallingState.IDLE &&
+    callingState === CallingState.JOINING;
+  const isStartingToJoinFromRinging =
+    prevCallingState === CallingState.RINGING &&
+    callingState === CallingState.JOINING;
+  const isOutgoingCall =
+    callingState === CallingState.RINGING && call?.isCreatedByMe;
+  const isCallJoined = callingState === CallingState.JOINED;
+
+  const shouldStartForegroundService =
+    isStartingToJoin ||
+    isStartingToJoinFromRinging ||
+    isOutgoingCall ||
+    isCallJoined;
+
   useEffect((): (() => void) | undefined => {
     if (Platform.OS === 'ios' || !activeCallCid) {
       return;
@@ -86,32 +106,32 @@ export const useAndroidKeepCallAliveEffect = () => {
     if (!notifeeLib) return;
 
     // start foreground service as soon as the call is joined
-    if (callingState === CallingState.JOINED) {
+    if (shouldStartForegroundService) {
       const run = async () => {
         if (foregroundServiceStartedRef.current) {
           return;
         }
         const notifee = notifeeLib.default;
-        notifee.getDisplayedNotifications().then((displayedNotifications) => {
-          const activeCallNotification = displayedNotifications.find(
-            (notification) => notification.id === activeCallCid
-          );
-          if (activeCallNotification) {
-            // this means that we have a incoming call notification shown as foreground service and we must stop it
-            notifee.stopForegroundService();
-            notifee.cancelDisplayedNotification(activeCallCid);
-          }
-          // request for notification permission and then start the foreground service
-          startForegroundService(activeCallCid).then(() => {
-            foregroundServiceStartedRef.current = true;
-          });
+        const displayedNotifications =
+          await notifee.getDisplayedNotifications();
+        const activeCallNotification = displayedNotifications.find(
+          (notification) => notification.id === activeCallCid
+        );
+        if (activeCallNotification) {
+          // this means that we have a incoming call notification shown as foreground service and we must stop it
+          notifee.stopForegroundService();
+          notifee.cancelDisplayedNotification(activeCallCid);
+        }
+        // check for notification permission and then start the foreground service
+        startForegroundService(activeCallCid).then(() => {
+          foregroundServiceStartedRef.current = true;
         });
       };
       run();
     } else if (callingState === CallingState.RINGING) {
-      // cancel any notifee displayed notification when the call has transitioned out of ringing
       return () => {
-        // cancels the non fg service notifications
+        // cancel any notifee displayed notification when the call has transitioned out of ringing
+        // NOTE: cancels only the non fg service notifications
         notifeeLib.default.cancelDisplayedNotification(activeCallCid);
       };
     } else if (
@@ -136,7 +156,7 @@ export const useAndroidKeepCallAliveEffect = () => {
           });
       }
     }
-  }, [activeCallCid, callingState]);
+  }, [activeCallCid, callingState, shouldStartForegroundService]);
 
   useEffect(() => {
     return () => {

package/src/utils/hooks/usePrevious.ts

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 
-export const usePrevious = (value: any) => {
+export const usePrevious = <T>(value: T) => {
   const valueRef = useRef(value);
 
   useEffect(() => {

package/src/utils/push/ios.ts

@@ -35,9 +35,15 @@ function processNonRingingNotificationStreamPayload(
 export const oniOSExpoNotificationEvent = (event: ExpoNotification) => {
   const pushConfig = StreamVideoRN.getConfig().push;
   if (pushConfig) {
-    if (event.request.trigger.type === 'push') {
-      const streamPayload = event.request.trigger.payload
-        ?.stream as StreamPushPayload;
+    const trigger = event.request.trigger;
+    if (
+      trigger &&
+      typeof trigger === 'object' &&
+      'type' in trigger &&
+      trigger.type === 'push' &&
+      trigger.payload?.stream
+    ) {
+      const streamPayload = trigger.payload.stream as StreamPushPayload;
       processNonRingingNotificationStreamPayload(streamPayload);
     }
   }

package/src/utils/push/utils.ts

@@ -25,17 +25,23 @@ export function isNotifeeStreamVideoEvent(event: Event) {
 }
 
 export function isExpoNotificationStreamVideoEvent(event: ExpoNotification) {
-  if (event.request.trigger.type === 'push') {
+  const trigger = event.request.trigger;
+  if (
+    trigger &&
+    typeof trigger === 'object' &&
+    'type' in trigger &&
+    trigger.type === 'push'
+  ) {
     // iOS
-    const streamPayload = event.request.trigger.payload
-      ?.stream as StreamPushPayload;
+    const streamPayload = trigger.payload?.stream as StreamPushPayload;
     // Android
-    const remoteMessageData = event.request.trigger.remoteMessage?.data;
+    const remoteMessageData = trigger.remoteMessage?.data;
     return (
       streamPayload?.sender === 'stream.video' ||
       remoteMessageData?.sender === 'stream.video'
     );
   }
+  return false;
 }
 
 export function isPushNotificationiOSStreamVideoEvent(

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.6.0';
+export const version = '1.6.1';