Skip to content

Commit 35d7b15

Browse files
authored
Merge pull request #52 from sendbird/feat/migrate-sample-rn-0.76.9
[CLNP-6596] fix: Improve stability of local video view on Android
2 parents a66e239 + 430c71d commit 35d7b15

File tree

6 files changed

+1146
-509
lines changed

6 files changed

+1146
-509
lines changed

android/src/main/java/com/sendbird/calls/reactnative/module/CallsCommonModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CallsCommonModule(private val root: CallsModule): CommonModule {
6666

6767
override fun initialize(appId: String): Boolean {
6868
RNCallsLogger.d("[CommonModule] initialize()")
69-
return SendBirdCall.init(root.reactContext, appId)
69+
return SendBirdCall.init(root.reactContext.applicationContext, appId)
7070
}
7171

7272
override fun authenticate(authParams: ReadableMap, promise: Promise) {

sample/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ ruby ">= 2.6.10"
66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

sample/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
compileSdkVersion = 35
88
targetSdkVersion = 34
99
ndkVersion = "26.1.10909125"
10-
kotlinVersion = "1.9.24"
10+
kotlinVersion = "1.9.25"
1111
}
1212
repositories {
1313
google()

sample/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@sendbird/uikit-react-native-foundation": "^1.0.0",
2525
"dayjs": "^1.11.13",
2626
"react": "18.3.1",
27-
"react-native": "0.76.0",
27+
"react-native": "0.76.9",
2828
"react-native-callkeep": "react-native-webrtc/react-native-callkeep",
2929
"react-native-camera-kit": "^14.1.0",
3030
"react-native-permissions": "^5.0.2",
@@ -37,12 +37,13 @@
3737
"@babel/core": "^7.25.2",
3838
"@babel/preset-env": "^7.25.3",
3939
"@babel/runtime": "^7.25.0",
40-
"@react-native-community/cli": "15.0.0-alpha.2",
41-
"@react-native-community/cli-platform-android": "15.0.0-alpha.2",
42-
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
43-
"@react-native/babel-preset": "0.76.0",
44-
"@react-native/metro-config": "0.76.0",
45-
"@react-native/typescript-config": "0.76.0",
40+
"@react-native-community/cli": "15.0.1",
41+
"@react-native-community/cli-platform-android": "15.0.1",
42+
"@react-native-community/cli-platform-ios": "15.0.1",
43+
"@react-native/babel-preset": "0.76.9",
44+
"@react-native/eslint-config": "0.76.9",
45+
"@react-native/metro-config": "0.76.9",
46+
"@react-native/typescript-config": "0.76.9",
4647
"@types/react": "^18.2.6",
4748
"babel-plugin-module-resolver": "^4.1.0",
4849
"typescript": "5.0.4"

sample/src/direct-call/callHandler/android.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export async function setNotificationForegroundService() {
3232
const onNotificationAction = async ({ type, detail }: Event) => {
3333
if (type !== EventType.ACTION_PRESS || !detail.notification?.data?.call) return;
3434

35-
const callProps = detail.notification.data.call as unknown as DirectCallProperties;
35+
const callProps = JSON.parse(detail.notification.data.call as string) as DirectCallProperties;
3636

3737
const directCall = await SendbirdCalls.getDirectCall(callProps.callId);
3838
if (directCall.isEnded) {

0 commit comments

Comments
 (0)