@stream-io/video-react-native-sdk 1.10.16 → 1.10.17

package/src/utils/push/android.ts

@@ -12,7 +12,9 @@ import type {
 } from '../StreamVideoRN/types';
 import {
   getFirebaseMessagingLib,
+  getFirebaseMessagingLibNoThrow,
   getExpoNotificationsLib,
+  getExpoNotificationsLibNoThrow,
   getNotifeeLibThrowIfNotInstalledForPush,
   type NotifeeLib,
   type FirebaseMessagingTypes,
@@ -49,7 +51,7 @@ type Event = Parameters<onBackgroundEventFunctionParams>[0];
 
 let lastFirebaseToken = { token: '', userId: '' };
 
-/** Send token to stream, create notification channel,  */
+/** Send token to stream  */
 export async function initAndroidPushToken(
   client: StreamVideoClient,
   pushConfig: PushConfig,
@@ -58,13 +60,14 @@ export async function initAndroidPushToken(
   if (Platform.OS !== 'android' || !pushConfig.android.pushProviderName) {
     return;
   }
+  const logger = getLogger(['initAndroidPushToken']);
   const setDeviceToken = async (token: string) => {
     const userId = client.streamClient._user?.id ?? '';
     if (
       lastFirebaseToken.token === token &&
       lastFirebaseToken.userId === userId
     ) {
-      getLogger(['initAndroidPushToken'])(
+      logger(
         'debug',
         `Skipping setting the same token again for userId: ${userId} and token: ${token}`
       );
@@ -74,33 +77,41 @@ export async function initAndroidPushToken(
     setPushLogoutCallback(async () => {
       lastFirebaseToken = { token: '', userId: '' };
       try {
-        getLogger(['initAndroidPushToken'])(
-          'debug',
-          `Logout removeDeviceToken: ${token}`
-        );
+        logger('debug', `Logout removeDeviceToken: ${token}`);
         await client.removeDevice(token);
       } catch (err) {
-        const logger = getLogger(['initAndroidPushToken']);
         logger('warn', 'Failed to remove firebase token from stream', err);
       }
     });
     const push_provider_name = pushConfig.android.pushProviderName;
+    logger('debug', `sending token from firebase: ${token}`);
     await client.addDevice(token, 'firebase', push_provider_name);
   };
   if (pushConfig.isExpo) {
-    const expoNotificationsLib = getExpoNotificationsLib();
-    const subscription = expoNotificationsLib.addPushTokenListener(
-      (devicePushToken) => {
-        setDeviceToken(devicePushToken.data);
-      }
-    );
-    setUnsubscribeListener(() => subscription.remove());
-    const devicePushToken =
-      await expoNotificationsLib.getDevicePushTokenAsync();
-    const token = devicePushToken.data;
-    await setDeviceToken(token);
-  } else {
-    const messaging = getFirebaseMessagingLib();
+    const expoNotificationsLib = pushConfig.onTapNonRingingCallNotification
+      ? getExpoNotificationsLib()
+      : getExpoNotificationsLibNoThrow();
+    if (expoNotificationsLib) {
+      logger('debug', `setting expo notification token listeners`);
+      const subscription = expoNotificationsLib.addPushTokenListener(
+        (devicePushToken) => {
+          setDeviceToken(devicePushToken.data);
+        }
+      );
+      setUnsubscribeListener(() => subscription.remove());
+      const devicePushToken =
+        await expoNotificationsLib.getDevicePushTokenAsync();
+      const token = devicePushToken.data;
+      await setDeviceToken(token);
+    }
+  }
+  // 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)
     );
@@ -246,7 +257,7 @@ export const firebaseDataHandler = async (
     if (!incomingCallChannel || !incomingCallNotificationTextGetters) {
       const logger = getLogger(['firebaseMessagingOnMessageHandler']);
       logger(
-        'info',
+        'error',
         "Can't show incoming call notification as either or both incomingCallChannel and incomingCallNotificationTextGetters were not provided"
       );
       return;

package/src/utils/push/libs/expoNotifications.ts

@@ -1,5 +1,6 @@
 export type ExpoNotificationsLib = typeof import('expo-notifications');
 
+import { getLogger } from '@stream-io/video-client';
 import type { Notification } from 'expo-notifications';
 
 export type ExpoNotification = Notification;
@@ -13,7 +14,17 @@ try {
 export function getExpoNotificationsLib() {
   if (!expoNotificationsLib) {
     throw Error(
-      'expo-notifications library is not installed. Please see https://docs.expo.dev/versions/latest/sdk/notifications/ for installation instructions'
+      'expo-notifications library is not installed. Please see https://docs.expo.dev/versions/latest/sdk/notifications/ for installation instructions. It is required for non ringing push notifications.'
+    );
+  }
+  return expoNotificationsLib;
+}
+
+export function getExpoNotificationsLibNoThrow() {
+  if (!expoNotificationsLib) {
+    getLogger(['getExpoNotificationsLibNoThrow'])(
+      'debug',
+      'expo-notifications library is not installed. It is required for non ringing push notifications and not for ringing'
     );
   }
   return expoNotificationsLib;

package/src/utils/push/libs/firebaseMessaging/index.ts

@@ -21,7 +21,7 @@ export function getFirebaseMessagingLibNoThrow(isExpo: boolean) {
   if (!lib) {
     const logger = getLogger(['getFirebaseMessagingLibNoThrow']);
     logger(
-      'warn',
+      'debug',
       `${
         isExpo
           ? 'In Expo, @react-native-firebase/messaging library is required to receive ringing notifications in app killed state for Android.'

package/src/utils/push/setupIosCallKeepEvents.ts

@@ -27,6 +27,14 @@ export function setupIosCallKeepEvents(
   if (Platform.OS !== 'ios' || !pushConfig.ios.pushProviderName) {
     return;
   }
+  if (!pushConfig.android.incomingCallChannel) {
+    // TODO: remove this check and find a better way once we have telecom integration for android
+    getLogger(['setupIosCallKeepEvents'])(
+      'debug',
+      'android incomingCallChannel is not defined, so skipping the setupIosCallKeepEvents'
+    );
+    return;
+  }
   const logger = getLogger(['setupIosCallKeepEvents']);
   const callkeep = getCallKeepLib();
 

package/src/utils/push/setupIosVoipPushEvents.ts

@@ -13,6 +13,14 @@ export function setupIosVoipPushEvents(
     return;
   }
   const logger = getLogger(['setupIosVoipPushEvents']);
+  if (!pushConfig.android.incomingCallChannel) {
+    // TODO: remove this check and find a better way once we have telecom integration for android
+    logger(
+      'debug',
+      'android incomingCallChannel is not defined, so skipping the setupIosVoipPushEvents'
+    );
+    return;
+  }
   const voipPushNotification = getVoipPushNotificationLib();
 
   logger('debug', 'notification event listener added');

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.10.16';
+export const version = '1.10.17';