Merge branch 'main' into codec-negotiation

# Conflicts: # yarn.lock
GetStream · Jan 3, 2025 · 8862b71 · 8862b71
2 parents 26abd69 + 7eec9b0
commit 8862b71
Show file tree

Hide file tree

Showing 93 changed files with 1,218 additions and 6,269 deletions.
diff --git a/packages/react-native-sdk/package.json b/packages/react-native-sdk/package.json
@@ -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",

diff --git a/packages/react-native-sdk/src/utils/push/ios.ts b/packages/react-native-sdk/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);
     }
   }

diff --git a/packages/react-native-sdk/src/utils/push/utils.ts b/packages/react-native-sdk/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(

diff --git a/sample-apps/react-native/expo-video-sample/.gitignore b/sample-apps/react-native/expo-video-sample/.gitignore
@@ -32,4 +32,13 @@ yarn-error.*
 .env*.local
 
 # typescript
-*.tsbuildinfo
+*.tsbuildinfo
+
+# managed prebuild - https://docs.expo.dev/guides/local-app-development/#local-app-compilation
+ios
+android
+# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
+# The following patterns were generated by expo-cli
+
+expo-env.d.ts
+# @end expo-cli
diff --git a/sample-apps/react-native/expo-video-sample/README.md b/sample-apps/react-native/expo-video-sample/README.md
@@ -31,4 +31,4 @@ cd sample-apps/react-native/expo-video-sample
 
 4. Run the app
 
-You can run the app either with [EAS Build](https://docs.expo.dev/build/introduction/) or [locally on your computer](https://docs.expo.dev/develop/development-builds/development-workflows/#build-locally-with-android-studio-and-xcode).
+You can run the app either with [EAS Build](https://docs.expo.dev/build/introduction/) or [locally on your computer](https://docs.expo.dev/guides/local-app-development/).
diff --git a/sample-apps/react-native/expo-video-sample/android/.gitignore b/sample-apps/react-native/expo-video-sample/android/.gitignore
diff --git a/sample-apps/react-native/expo-video-sample/android/app/build.gradle b/sample-apps/react-native/expo-video-sample/android/app/build.gradle
diff --git a/sample-apps/react-native/expo-video-sample/android/app/debug.keystore b/sample-apps/react-native/expo-video-sample/android/app/debug.keystore
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@ cd sample-apps/react-native/expo-video-sample

		4. Run the app

		You can run the app either with [EAS Build](https://docs.expo.dev/build/introduction/) or [locally on your computer](https://docs.expo.dev/develop/development-builds/development-workflows/#build-locally-with-android-studio-and-xcode).
		You can run the app either with [EAS Build](https://docs.expo.dev/build/introduction/) or [locally on your computer](https://docs.expo.dev/guides/local-app-development/).