diff --git a/packages/react-native-hms/android/build.gradle b/packages/react-native-hms/android/build.gradle index cd76a4141..660828f82 100644 --- a/packages/react-native-hms/android/build.gradle +++ b/packages/react-native-hms/android/build.gradle @@ -49,6 +49,7 @@ def safeExtGet(prop, fallback) { } android { + namespace 'com.reactnativehmssdk' compileSdkVersion safeExtGet('Hmssdk_compileSdkVersion', 31) defaultConfig { minSdkVersion safeExtGet('Hmssdk_minSdkVersion', 21) diff --git a/packages/react-native-room-kit/example/ExampleAppChangelog.txt b/packages/react-native-room-kit/example/ExampleAppChangelog.txt index 596ef1103..1e2a4475b 100644 --- a/packages/react-native-room-kit/example/ExampleAppChangelog.txt +++ b/packages/react-native-room-kit/example/ExampleAppChangelog.txt @@ -1,7 +1,10 @@ Board: https://app.devrev.ai/100ms/vistas/vista-254 -- Support for long-running sessions -https://app.devrev.ai/100ms/works/ISS-23133 +- SugarFit: Add support for Android 14 on React Native Android SDK +https://app.devrev.ai/100ms/works/ISS-23560 + +- Remove Foreground Notification Service from Android app +https://app.devrev.ai/100ms/works/ISS-23562 - Native Android crash fixes https://app.devrev.ai/100ms/works/ISS-23550 @@ -9,4 +12,4 @@ https://app.devrev.ai/100ms/works/ISS-23550 Room Kit: 1.2.3 React Native SDK: 1.11.0 Android SDK: 2.9.68 -iOS SDK: 1.16.3 +iOS SDK: 1.16.4 diff --git a/packages/react-native-room-kit/example/android/Gemfile.lock b/packages/react-native-room-kit/example/android/Gemfile.lock index 9f0247213..9cd9f4be7 100644 --- a/packages/react-native-room-kit/example/android/Gemfile.lock +++ b/packages/react-native-room-kit/example/android/Gemfile.lock @@ -10,7 +10,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.989.0) + aws-partitions (1.991.0) aws-sdk-core (3.209.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -19,7 +19,7 @@ GEM aws-sdk-kms (1.94.0) aws-sdk-core (~> 3, >= 3.207.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.167.0) + aws-sdk-s3 (1.168.0) aws-sdk-core (~> 3, >= 3.207.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) diff --git a/packages/react-native-room-kit/example/android/app/build.gradle b/packages/react-native-room-kit/example/android/app/build.gradle index 379633671..e43629bf7 100644 --- a/packages/react-native-room-kit/example/android/app/build.gradle +++ b/packages/react-native-room-kit/example/android/app/build.gradle @@ -98,8 +98,8 @@ android { applicationId "live.hms.rn" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 537 - versionName "2.4.87" + versionCode 538 + versionName "2.4.88" missingDimensionStrategy 'react-native-camera', 'general' } diff --git a/packages/react-native-room-kit/example/ios/Gemfile.lock b/packages/react-native-room-kit/example/ios/Gemfile.lock index a40b10880..2d1bf855c 100644 --- a/packages/react-native-room-kit/example/ios/Gemfile.lock +++ b/packages/react-native-room-kit/example/ios/Gemfile.lock @@ -10,7 +10,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.989.0) + aws-partitions (1.991.0) aws-sdk-core (3.209.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -19,7 +19,7 @@ GEM aws-sdk-kms (1.94.0) aws-sdk-core (~> 3, >= 3.207.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.167.0) + aws-sdk-s3 (1.168.0) aws-sdk-core (~> 3, >= 3.207.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) diff --git a/packages/react-native-room-kit/example/ios/RNExample.xcodeproj/project.pbxproj b/packages/react-native-room-kit/example/ios/RNExample.xcodeproj/project.pbxproj index 24105b945..53a04a2c3 100644 --- a/packages/react-native-room-kit/example/ios/RNExample.xcodeproj/project.pbxproj +++ b/packages/react-native-room-kit/example/ios/RNExample.xcodeproj/project.pbxproj @@ -496,7 +496,7 @@ CODE_SIGN_ENTITLEMENTS = RNExample/RNExample.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 537; + CURRENT_PROJECT_VERSION = 538; DEVELOPMENT_TEAM = 5N85PP82A9; ENABLE_BITCODE = NO; INFOPLIST_FILE = RNExample/Info.plist; @@ -534,7 +534,7 @@ CODE_SIGN_ENTITLEMENTS = RNExample/RNExample.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 537; + CURRENT_PROJECT_VERSION = 538; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5N85PP82A9; INFOPLIST_FILE = RNExample/Info.plist; @@ -706,7 +706,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = RNExampleBroadcastUpload/RNExampleBroadcastUpload.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 537; + CURRENT_PROJECT_VERSION = 538; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 5N85PP82A9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -748,7 +748,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 537; + CURRENT_PROJECT_VERSION = 538; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5N85PP82A9; diff --git a/packages/react-native-room-kit/example/ios/RNExample/Info.plist b/packages/react-native-room-kit/example/ios/RNExample/Info.plist index bb9fd780a..12305db1e 100644 --- a/packages/react-native-room-kit/example/ios/RNExample/Info.plist +++ b/packages/react-native-room-kit/example/ios/RNExample/Info.plist @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.4.87 + 2.4.88 CFBundleSignature ???? CFBundleVersion - 537 + 538 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/packages/react-native-room-kit/example/package-lock.json b/packages/react-native-room-kit/example/package-lock.json index 3964aac94..fe5725a44 100644 --- a/packages/react-native-room-kit/example/package-lock.json +++ b/packages/react-native-room-kit/example/package-lock.json @@ -15,7 +15,6 @@ "@react-navigation/native": "6.1.7", "@react-navigation/native-stack": "6.5.0", "@shopify/flash-list": "^1.4.3", - "@voximplant/react-native-foreground-service": "github:ygit/react-native-foreground-service", "lottie-react-native": "^6.7.2", "react": "18.2.0", "react-native": "0.71.19", @@ -5301,14 +5300,6 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, - "node_modules/@voximplant/react-native-foreground-service": { - "version": "3.0.2", - "resolved": "git+ssh://git@github.com/ygit/react-native-foreground-service.git#46e2db84ca3ebd99a83ce5266403cf8ce87293a5", - "license": "MIT", - "peerDependencies": { - "react-native": ">= 0.41.2" - } - }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", diff --git a/packages/react-native-room-kit/example/package.json b/packages/react-native-room-kit/example/package.json index 965f36200..5a18f9179 100644 --- a/packages/react-native-room-kit/example/package.json +++ b/packages/react-native-room-kit/example/package.json @@ -17,7 +17,6 @@ "@react-navigation/native": "6.1.7", "@react-navigation/native-stack": "6.5.0", "@shopify/flash-list": "^1.4.3", - "@voximplant/react-native-foreground-service": "github:ygit/react-native-foreground-service", "lottie-react-native": "^6.7.2", "react": "18.2.0", "react-native": "0.71.19", diff --git a/packages/react-native-room-kit/example/src/screens/HMSPrebuiltScreen/index.tsx b/packages/react-native-room-kit/example/src/screens/HMSPrebuiltScreen/index.tsx index 1de1cacba..a7276feb6 100644 --- a/packages/react-native-room-kit/example/src/screens/HMSPrebuiltScreen/index.tsx +++ b/packages/react-native-room-kit/example/src/screens/HMSPrebuiltScreen/index.tsx @@ -1,5 +1,5 @@ -import React, { useCallback, useEffect, useMemo } from 'react'; -import { Platform, Text } from 'react-native'; +import React, { useCallback, useMemo } from 'react'; +import { Text } from 'react-native'; import { NavigationProp, RouteProp, @@ -15,8 +15,6 @@ import type { import { AppStackParamList } from '../../navigator'; -import VIForegroundService from '@voximplant/react-native-foreground-service'; - export const HMSPrebuiltScreen = () => { const navigation = useNavigation>(); const screenParams = @@ -36,9 +34,6 @@ export const HMSPrebuiltScreen = () => { */ const handleMeetingLeave: OnLeaveHandler = useCallback(async (reason) => { console.log(':: reason > ', reason); // Logs the reason for leaving the meeting. - if (Platform.OS === 'android') { - await VIForegroundService.getInstance().stopService(); // Stops the foreground service on Android. - } navigation.navigate('QRCodeScreen'); // Navigates to the QRCodeScreen. }, []); @@ -75,48 +70,6 @@ export const HMSPrebuiltScreen = () => { [screenParams] // Recomputes the memoized value when screenParams changes. ); - useEffect(() => { - // Checks if the platform is Android before attempting to start the foreground service. - // This is necessary because the foreground service functionality is specific to Android. - if (Platform.OS === 'android') { - // Defines an asynchronous function to start the Android foreground service. - const startAndroidForegroundService = async () => { - // Configuration for the Android notification channel. - // This is required for Android O and above to show notifications. - const androidForegroundServiceChannelConfig = { - id: 'MyAppChannelID', // Unique ID for the notification channel. - name: 'My App Channel name', // Name for the notification channel. - enableVibration: true, // Enables vibration for notifications from this channel. - importance: 5, // Sets the importance level for notifications from this channel. - }; - // Creates the notification channel with the specified configuration. - await VIForegroundService.getInstance().createNotificationChannel( - androidForegroundServiceChannelConfig - ); - - // Configuration for the notification that will be shown while the service is running. - const notificationConfig = { - channelId: 'MyAppChannelID', // Associates the notification with the created channel ID. - id: 1000, // Unique ID for the notification. - title: 'Foreground Service', // Title for the notification. - text: 'Starting Android Foreground Service now', // Text content for the notification. - icon: '../assets/100ms-logo.png', // Icon for the notification. - priority: 2, // Priority for the notification. - }; - // Attempts to start the foreground service with the specified notification configuration. - try { - VIForegroundService.getInstance().startService(notificationConfig); - } catch (e) { - // Logs an error if starting the foreground service fails. - console.error(e); - } - }; - - // Calls the function to start the Android foreground service. - startAndroidForegroundService(); - } - }, []); // The empty dependency array ensures this effect runs only once after the initial render. - // Room Code is required to join the room if (!roomCode) { return Room Code is Required;