@stream-io/video-react-native-sdk 0.7.3 → 0.7.5

package/src/utils/push/android.ts

@@ -1,4 +1,8 @@
-import notifee, { EventType, Event } from '@notifee/react-native';
+import notifee, {
+  EventType,
+  Event,
+  AndroidCategory,
+} from '@notifee/react-native';
 import { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
 import { Call, RxUtils, StreamVideoClient } from '@stream-io/video-client';
 import { AppState, Platform } from 'react-native';
@@ -18,6 +22,7 @@ import {
   pushTappedIncomingCallCId$,
   pushNonRingingCallData$,
   pushUnsubscriptionCallbacks$,
+  pushAndroidBackgroundDeliveredIncomingCallCId$,
 } from './rxSubjects';
 import {
   canAddPushWSSubscriptionsRef,
@@ -103,12 +108,12 @@ export function setupFirebaseHandlerAndroid(pushConfig: PushConfig) {
     ); // this is to listen to foreground messages, which we dont need for now
   }
 
-  // the notification tap handlers are always registered with notifee for both platforms
+  // the notification tap handlers are always registered with notifee for both expo and non-expo in android
   notifee.onBackgroundEvent(async (event) => {
-    await onNotifeeEvent(event, pushConfig);
+    await onNotifeeEvent(event, pushConfig, true);
   });
   notifee.onForegroundEvent((event) => {
-    onNotifeeEvent(event, pushConfig);
+    onNotifeeEvent(event, pushConfig, false);
   });
 }
 
@@ -274,6 +279,10 @@ const firebaseMessagingOnMessageHandler = async (
             },
           },
         ],
+        category: AndroidCategory.CALL,
+        fullScreenAction: {
+          id: 'stream_ringing_incoming_call',
+        },
         timeoutAfter: 60000, // 60 seconds, after which the notification will be dismissed automatically
       },
     });
@@ -331,17 +340,16 @@ const firebaseMessagingOnMessageHandler = async (
   }
 };
 
-const onNotifeeEvent = async (event: Event, pushConfig: PushConfig) => {
+const onNotifeeEvent = async (
+  event: Event,
+  pushConfig: PushConfig,
+  isBackground: boolean,
+) => {
   const { type, detail } = event;
   const { notification, pressAction } = detail;
   const notificationId = notification?.id;
   const data = notification?.data;
-  if (
-    !data ||
-    !pressAction ||
-    !notificationId ||
-    data.sender !== 'stream.video'
-  ) {
+  if (!data || !notificationId || data.sender !== 'stream.video') {
     return;
   }
 
@@ -357,13 +365,13 @@ const onNotifeeEvent = async (event: Event, pushConfig: PushConfig) => {
     // Check if we need to decline the call
     const didPressDecline =
       type === EventType.ACTION_PRESS &&
-      pressAction.id === DECLINE_CALL_ACTION_ID;
+      pressAction?.id === DECLINE_CALL_ACTION_ID;
     const didDismiss = type === EventType.DISMISSED;
     const mustDecline = didPressDecline || didDismiss;
     // Check if we need to accept the call
     const mustAccept =
       type === EventType.ACTION_PRESS &&
-      pressAction.id === ACCEPT_CALL_ACTION_ID;
+      pressAction?.id === ACCEPT_CALL_ACTION_ID;
 
     if (mustAccept || mustDecline || type === EventType.ACTION_PRESS) {
       clearPushWSEventSubscriptions();
@@ -380,9 +388,14 @@ const onNotifeeEvent = async (event: Event, pushConfig: PushConfig) => {
         return;
       }
       await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
-    } else if (type === EventType.PRESS) {
-      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 (type === EventType.PRESS) {
+        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 === EventType.DELIVERED) {
+        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 {
     if (type === EventType.PRESS) {

package/src/utils/push/rxSubjects.ts

@@ -25,6 +25,14 @@ export const pushTappedIncomingCallCId$ = new BehaviorSubject<
   string | undefined
 >(undefined);
 
+/**
+ * This rxjs subject is used to store the call cid of the delivered incoming call from push notification it is neither accepted nor rejected yet
+ * Used so that the call is navigated to when app is open from being killed
+ * Note: it should be subscribed only when a user has connected to the websocket of Stream
+ */
+export const pushAndroidBackgroundDeliveredIncomingCallCId$ =
+  new BehaviorSubject<string | undefined>(undefined);
+
 /**
  * This rxjs subject is used to store the call cid of the accepted incoming call from push notification
  * Note: it should be subscribed only when a user has connected to the websocket of Stream

package/src/utils/push/utils.ts

@@ -87,7 +87,7 @@ export const processCallFromPushInBackground = async (
 export const processCallFromPush = async (
   client: StreamVideoClient,
   call_cid: string,
-  action: 'accept' | 'decline' | 'pressed',
+  action: 'accept' | 'decline' | 'pressed' | 'backgroundDelivered',
 ) => {
   let callFromPush: Call;
   try {
@@ -96,7 +96,7 @@ export const processCallFromPush = async (
     console.log('failed to fetch call from push notification', e);
     return;
   }
-  // note: when action was pressed, we dont need to do anything as the only thing is to do is to get the call which adds it to the client
+  // note: when action was pressed or delivered, we dont need to do anything as the only thing is to do is to get the call which adds it to the client
   try {
     if (action === 'accept') {
       await callFromPush.join();

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.7.3';
+export const version = '0.7.5';