Merge branch 'refs/heads/main' into reconnect-v2

GetStream · Aug 8, 2024 · f6f1531 · f6f1531
2 parents e3cb2b0 + 7065350
commit f6f1531
Show file tree

Hide file tree

Showing 32 changed files with 285 additions and 181 deletions.
diff --git a/packages/client/docusaurus/docs/javascript/02-guides/02-joining-creating-calls.mdx b/packages/client/docusaurus/docs/javascript/02-guides/02-joining-creating-calls.mdx
@@ -97,7 +97,7 @@ Ending a call requires a [special permission](../../guides/permissions-and-moder
 await call.endCall();
 ```
 
-Only users with special permission can join an ended call.
+Only users with a special permission (`OwnCapability.JOIN_ENDED_CALL`) can join an ended call.
 
 ### Load call
 

diff --git a/packages/react-native-sdk/CHANGELOG.md b/packages/react-native-sdk/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.10.0](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.9.7...@stream-io/video-react-native-sdk-0.10.0) (2024-08-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* **react-native:** make notifee to be optional (#1456)
+
+### Bug Fixes
+
+* **react-native:** make notifee to be optional ([#1456](https://github.com/GetStream/stream-video-js/issues/1456)) ([0b3f787](https://github.com/GetStream/stream-video-js/commit/0b3f7876c82a8873901bc1bc77a17f6f98825166))
+
+### [0.9.7](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.9.6...@stream-io/video-react-native-sdk-0.9.7) (2024-08-06)
+
+
+### Bug Fixes
+
+* added workaround for android where video doesn't resume when resuming app from lock screen ([#1454](https://github.com/GetStream/stream-video-js/issues/1454)) ([b112506](https://github.com/GetStream/stream-video-js/commit/b1125069b24c3bbbf0191582ba27ff841a0cd9f8))
+
 ### [0.9.6](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.9.5...@stream-io/video-react-native-sdk-0.9.6) (2024-07-31)
 
 ### Dependency Updates

diff --git a/...ve-sdk/docusaurus/docs/reactnative/01-setup/02-installation/01-react-native.mdx b/...ve-sdk/docusaurus/docs/reactnative/01-setup/02-installation/01-react-native.mdx
@@ -24,7 +24,7 @@ Stream Video React Native SDK requires installing some peer dependencies to prov
 ```bash title=Terminal
 yarn add @stream-io/react-native-webrtc \
    react-native-incall-manager react-native-svg \
-   @react-native-community/netinfo @notifee/react-native
+   @react-native-community/netinfo
 npx pod-install
 ```
 
@@ -35,7 +35,6 @@ So what did we install precisely?
 - `react-native-incall-manager` handles media-routes/sensors/events during an audio/video call.
 - `react-native-svg` provides SVG support to React Native, SVRN's components and it's icons are reliant on this dependency.
 - `@react-native-community/netinfo` - is used to detect the device's connectivity state, type and quality.
-- `@notifee/react-native` - is used to keep calls alive in the background on Android.
 
 ### Android Specific installation
 

diff --git a/...act-native-sdk/docusaurus/docs/reactnative/01-setup/02-installation/02-expo.mdx b/...act-native-sdk/docusaurus/docs/reactnative/01-setup/02-installation/02-expo.mdx
@@ -22,7 +22,6 @@ npx expo install @config-plugins/react-native-webrtc
 npx expo install react-native-incall-manager
 npx expo install react-native-svg
 npx expo install @react-native-community/netinfo
-npx expo install @notifee/react-native
 ```
 
 So what did we install precisely?
@@ -33,7 +32,6 @@ So what did we install precisely?
 - `react-native-incall-manager` handles media-routes/sensors/events during an audio/video call.
 - `react-native-svg` provides SVG support to React Native, SVRN's components and it's icons are reliant on this dependency.
 - `@react-native-community/netinfo` - is used to detect the device's connectivity state, type and quality.
-- `@notifee/react-native` - is used to keep calls alive in the background on Android.
 
 ### Android Specific installation
 

diff --git a/...ct-native-sdk/docusaurus/docs/reactnative/03-core/02-joining-creating-calls.mdx b/...ct-native-sdk/docusaurus/docs/reactnative/03-core/02-joining-creating-calls.mdx
@@ -77,7 +77,7 @@ Ending a call requires a [special permission](../../guides/permissions-and-moder
 await call.endCall();
 ```
 
-Only users with special permission can join an ended call.
+Only users with a special permission (`OwnCapability.JOIN_ENDED_CALL`) can join an ended call.
 
 ### Load call
 

diff --git a/.../react-native-sdk/docusaurus/docs/reactnative/03-core/07-keeping-call-alive.mdx b/.../react-native-sdk/docusaurus/docs/reactnative/03-core/07-keeping-call-alive.mdx
@@ -17,44 +17,32 @@ Head over to the documentation [here](../../advanced/pip/) on how to picture-in-
 
 ### Android 7
 
-There is no support for Picture-in-picture (PiP) mode below Android 8. Hence in those platforms, we use a [foreground service](https://developer.android.com/guide/components/foreground-services) to keep the call alive. The SDK will manage the foreground service. In Expo, the config plugin adds it up. But if Expo is not used, be sure to add the following:
-
-#### Add declarations in AndroidManifest
+There is no support for Picture-in-picture (PiP) mode below Android 8. Hence in those platforms, we use a [foreground service](https://developer.android.com/guide/components/foreground-services) to keep the call alive. The SDK will automatically create and manage the foreground service. The only requirement is to install the `Notifee` library so that SDK can handle a foreground service. To install the [`Notifee`](https://github.com/invertase/notifee) library, run the following command in your terminal of choice:
 
 <Tabs groupId="current-platform" queryString>
   <TabItem value="expo" label="Expo">
 
-In Expo, declarations in Android Manifest are automatically done by the expo config plugin of the SDK, so nothing needs to be added manually.
+```bash title=Terminal
+npx expo install @notifee/react-native
+```
 
   </TabItem>
   <TabItem value="reactnative" label="React Native">
 
-Add the following in `AndroidManifest.xml`:
-
-```xml title="AndroidManifest.xml"
-<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-<!-- We declare the permissions to for using foreground service -->
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-<service
-    android:name="app.notifee.core.ForegroundService"
-    tools:replace="android:foregroundServiceType"
-    android:stopWithTask="true"
-    android:foregroundServiceType="dataSync" />
+```bash title=Terminal
+yarn add @notifee/react-native
+npx pod-install
 ```
 
   </TabItem>
 </Tabs>
 
-
-#### Optional: override the default configuration of the notifications
+#### Optional: override the default configuration of the foreground service notifications
 
 You can also optionally override the default configuration of the notification used by the SDK. Below we give an example of that:
 
 ```ts
 import { StreamVideoRN } from '@stream-io/video-react-native-sdk';
-import { AndroidImportance } from '@notifee/react-native';
 
 StreamVideoRN.updateConfig({
   foregroundService: {

diff --git a/...ctnative/06-advanced/04-push-notifications/03-ringing-setup/01-react-native.mdx b/...ctnative/06-advanced/04-push-notifications/03-ringing-setup/01-react-native.mdx
@@ -27,6 +27,7 @@ yarn add @react-native-firebase/app
 yarn add @react-native-firebase/messaging
 yarn add react-native-callkeep
 yarn add react-native-voip-push-notification
+yarn add @notifee/react-native
 npx pod-install
 ```
 

diff --git a/...docs/reactnative/06-advanced/04-push-notifications/03-ringing-setup/02-expo.mdx b/...docs/reactnative/06-advanced/04-push-notifications/03-ringing-setup/02-expo.mdx
@@ -27,6 +27,7 @@ npx expo install @react-native-firebase/app
 npx expo install @react-native-firebase/messaging
 npx expo install react-native-voip-push-notification
 npx expo install react-native-callkeep
+npx expo install @notifee/react-native
 ```
 
 So what did we install precisely?

diff --git a/...-advanced/04-push-notifications/04-other-than-ringing-setup/01-react-native.mdx b/...-advanced/04-push-notifications/04-other-than-ringing-setup/01-react-native.mdx
@@ -20,6 +20,7 @@ Please follow the below guides for adding appropriate push providers to Stream:
 yarn add @react-native-firebase/app
 yarn add @react-native-firebase/messaging
 yarn add @react-native-community/push-notification-ios
+yarn add @notifee/react-native
 npx pod-install
 ```
 

diff --git a/...ative/06-advanced/04-push-notifications/04-other-than-ringing-setup/02-expo.mdx b/...ative/06-advanced/04-push-notifications/04-other-than-ringing-setup/02-expo.mdx
@@ -19,6 +19,7 @@ Please follow the below guides for adding appropriate push providers to Stream:
 ```bash title=Terminal
 npx expo install expo-notifications
 npx expo install expo-task-manager
+npx expo install @notifee/react-native
 ```
 
 So what did we install precisely?

diff --git a/...urus/docs/reactnative/06-advanced/08-screensharing/02-setup/01-react-native.mdx b/...urus/docs/reactnative/06-advanced/08-screensharing/02-setup/01-react-native.mdx
@@ -19,7 +19,6 @@ To be able to use the foreground service, the permission must be declared in the
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 <!-- We declare the permissions to for using foreground service -->
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
 // highlight-next-line
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 ```

diff --git a/packages/react-native-sdk/expo-config-plugin/__tests__/withAndroidManifest.test.ts b/packages/react-native-sdk/expo-config-plugin/__tests__/withAndroidManifest.test.ts
@@ -35,6 +35,9 @@ const getMainActivityOrThrow = AndroidConfig.Manifest.getMainActivityOrThrow;
 const sampleManifestPath = getFixturePath('AndroidManifest.xml');
 
 const props: ConfigProps = {
+  ringingPushNotifications: {
+    disableVideoIos: false,
+  },
   androidPictureInPicture: {
     enableAutomaticEnter: true,
   },

diff --git a/packages/react-native-sdk/expo-config-plugin/__tests__/withAndroidPermissions.test.ts b/packages/react-native-sdk/expo-config-plugin/__tests__/withAndroidPermissions.test.ts
@@ -14,6 +14,7 @@ describe('withStreamVideoReactNativeSDKAndroidPermissions', () => {
     };
     const props: ConfigProps = {
       enableScreenshare: true,
+      ringingPushNotifications: { disableVideoIos: false },
     };
 
     const updatedConfig = withStreamVideoReactNativeSDKAndroidPermissions(

diff --git a/packages/react-native-sdk/expo-config-plugin/src/withAndroidManifest.ts b/packages/react-native-sdk/expo-config-plugin/src/withAndroidManifest.ts
@@ -16,12 +16,11 @@ type ManifestService = Unpacked<
 >;
 
 function getNotifeeService() {
-  /* Example:
+  /* We add this service to the AndroidManifest.xml:
     <service
         android:name="app.notifee.core.ForegroundService"
         android:stopWithTask="true"
-        
-        android:foregroundServiceType="mediaProjection" />
+        android:foregroundServiceType="dataSync" />
  */
   const foregroundServiceType = 'dataSync';
   let head = prefixAndroidKeys({
@@ -40,10 +39,10 @@ const withStreamVideoReactNativeSDKManifest: ConfigPlugin<ConfigProps> = (
   props
 ) => {
   return withAndroidManifest(configuration, (config) => {
-    try {
-      const androidManifest = config.modResults;
-      const mainApplication = getMainApplicationOrThrow(androidManifest);
-      /* Add the notifee Service */
+    const androidManifest = config.modResults;
+    const mainApplication = getMainApplicationOrThrow(androidManifest);
+    if (props?.ringingPushNotifications) {
+      /* Add the notifee foreground Service */
       let services = mainApplication.service ?? [];
       // we filter out the existing notifee service (if any) so that we can override it
       services = services.filter(
@@ -52,39 +51,32 @@ const withStreamVideoReactNativeSDKManifest: ConfigPlugin<ConfigProps> = (
       );
       services.push(getNotifeeService());
       mainApplication.service = services;
+    }
 
-      if (props?.androidPictureInPicture) {
-        const mainActivity = getMainActivityOrThrow(androidManifest);
-        ('keyboard|keyboardHidden|orientation|screenSize|uiMode');
-        const currentConfigChangesArray = mainActivity.$[
-          'android:configChanges'
-        ]
-          ? mainActivity.$['android:configChanges'].split('|')
-          : [];
-        const neededConfigChangesArray =
-          'screenSize|smallestScreenSize|screenLayout|orientation'.split('|');
-        // Create a Set from the two arrays.
-        const set = new Set([
-          ...currentConfigChangesArray,
-          ...neededConfigChangesArray,
-        ]);
-        const mergedConfigChanges = [...set];
-        mainActivity.$['android:configChanges'] = mergedConfigChanges.join('|');
-        mainActivity.$['android:supportsPictureInPicture'] = 'true';
-      }
+    if (props?.androidPictureInPicture) {
+      const mainActivity = getMainActivityOrThrow(androidManifest);
+      ('keyboard|keyboardHidden|orientation|screenSize|uiMode');
+      const currentConfigChangesArray = mainActivity.$['android:configChanges']
+        ? mainActivity.$['android:configChanges'].split('|')
+        : [];
+      const neededConfigChangesArray =
+        'screenSize|smallestScreenSize|screenLayout|orientation'.split('|');
+      // Create a Set from the two arrays.
+      const set = new Set([
+        ...currentConfigChangesArray,
+        ...neededConfigChangesArray,
+      ]);
+      const mergedConfigChanges = [...set];
+      mainActivity.$['android:configChanges'] = mergedConfigChanges.join('|');
+      mainActivity.$['android:supportsPictureInPicture'] = 'true';
+    }
 
-      if (props?.ringingPushNotifications?.showWhenLockedAndroid) {
-        const mainActivity = getMainActivityOrThrow(androidManifest);
-        mainActivity.$['android:showWhenLocked'] = 'true';
-        mainActivity.$['android:turnScreenOn'] = 'true';
-      }
-      config.modResults = androidManifest;
-    } catch (error: any) {
-      console.log(error);
-      throw new Error(
-        'Cannot setup StreamVideoReactNativeSDK because the AndroidManifest is malformed'
-      );
+    if (props?.ringingPushNotifications?.showWhenLockedAndroid) {
+      const mainActivity = getMainActivityOrThrow(androidManifest);
+      mainActivity.$['android:showWhenLocked'] = 'true';
+      mainActivity.$['android:turnScreenOn'] = 'true';
     }
+    config.modResults = androidManifest;
     return config;
   });
 };

diff --git a/packages/react-native-sdk/expo-config-plugin/src/withAndroidPermissions.ts b/packages/react-native-sdk/expo-config-plugin/src/withAndroidPermissions.ts
@@ -4,22 +4,29 @@ import { ConfigProps } from './common/types';
 const withStreamVideoReactNativeSDKAndroidPermissions: ConfigPlugin<
   ConfigProps
 > = (configuration, props) => {
-  const foregroundServicePermissions = [
-    'android.permission.FOREGROUND_SERVICE',
-    'android.permission.FOREGROUND_SERVICE_DATA_SYNC',
-  ];
-  if (props?.enableScreenshare) {
-    foregroundServicePermissions.push(
-      'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION'
-    );
-  }
-  const config = AndroidConfig.Permissions.withPermissions(configuration, [
-    'android.permission.POST_NOTIFICATIONS',
-    ...foregroundServicePermissions,
+  const permissions = [
     'android.permission.BLUETOOTH',
     'android.permission.BLUETOOTH_CONNECT',
     'android.permission.BLUETOOTH_ADMIN',
-  ]);
+  ];
+  if (props?.ringingPushNotifications || props?.enableScreenshare) {
+    permissions.push(
+      'android.permission.POST_NOTIFICATIONS',
+      'android.permission.FOREGROUND_SERVICE'
+    );
+    if (props?.ringingPushNotifications) {
+      permissions.push('android.permission.FOREGROUND_SERVICE_DATA_SYNC');
+    }
+    if (props?.enableScreenshare) {
+      permissions.push(
+        'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION'
+      );
+    }
+  }
+  const config = AndroidConfig.Permissions.withPermissions(
+    configuration,
+    permissions
+  );
   return config;
 };
 

diff --git a/packages/react-native-sdk/expo-config-plugin/src/withMainActivity.ts b/packages/react-native-sdk/expo-config-plugin/src/withMainActivity.ts
@@ -13,39 +13,33 @@ const withStreamVideoReactNativeSDKMainActivity: ConfigPlugin<ConfigProps> = (
   return withMainActivity(configuration, (config) => {
     const isMainActivityJava = config.modResults.language === 'java';
 
-    try {
-      config.modResults.contents = addImports(
+    config.modResults.contents = addImports(
+      config.modResults.contents,
+      [
+        'com.streamvideo.reactnative.StreamVideoReactNative',
+        'android.os.Build',
+        'android.util.Rational',
+        'androidx.lifecycle.Lifecycle',
+        'android.app.PictureInPictureParams',
+        'com.oney.WebRTCModule.WebRTCModuleOptions',
+      ],
+      isMainActivityJava
+    );
+    config.modResults.contents = addOnPictureInPictureModeChanged(
+      config.modResults.contents,
+      isMainActivityJava
+    );
+    if (props?.androidPictureInPicture?.enableAutomaticEnter) {
+      config.modResults.contents = addOnUserLeaveHint(
         config.modResults.contents,
-        [
-          'com.streamvideo.reactnative.StreamVideoReactNative',
-          'android.os.Build',
-          'android.util.Rational',
-          'androidx.lifecycle.Lifecycle',
-          'android.app.PictureInPictureParams',
-          'com.oney.WebRTCModule.WebRTCModuleOptions',
-        ],
         isMainActivityJava
       );
-      config.modResults.contents = addOnPictureInPictureModeChanged(
+    }
+    if (props?.enableScreenshare) {
+      config.modResults.contents = addInsideOnCreate(
         config.modResults.contents,
         isMainActivityJava
       );
-      if (props?.androidPictureInPicture?.enableAutomaticEnter) {
-        config.modResults.contents = addOnUserLeaveHint(
-          config.modResults.contents,
-          isMainActivityJava
-        );
-      }
-      if (props?.enableScreenshare) {
-        config.modResults.contents = addInsideOnCreate(
-          config.modResults.contents,
-          isMainActivityJava
-        );
-      }
-    } catch (error: any) {
-      throw new Error(
-        "Cannot add StreamVideoReactNativeSDK to the project's MainApplication because it's malformed."
-      );
     }
 
     return config;

diff --git a/packages/react-native-sdk/jest-setup.ts b/packages/react-native-sdk/jest-setup.ts
@@ -27,6 +27,10 @@ jest.mock('react-native/Libraries/Utilities/Platform', () => ({
   OS: 'ios',
   select: jest.fn((selector) => selector.ios),
   Version: '16.2',
+  constants: {
+    osVersion: '16.2',
+    systemName: 'iOS',
+  },
 }));
 
 // Mock the notifee module using the mock provided by @notifee/react-native itself