From 547c85225dbbafffdafd5cd74df6d6594962b5a2 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Mon, 11 Nov 2024 09:16:56 +0100 Subject: [PATCH 1/4] add macOS check to pod install commands for the integration test application --- integration_test/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test/package.json b/integration_test/package.json index 5a33d6d9..cf59e111 100644 --- a/integration_test/package.json +++ b/integration_test/package.json @@ -14,8 +14,8 @@ "test:android": "yarn stop-test:android && yarn start-test:android", "test:ios": "yarn stop-test:ios && yarn start-test:ios", "pods": "yarn pods-install || yarn pods-update", - "pods-install": "NO_FLIPPER=1 yarn pod-install", - "pods-update": "cd ios && NO_FLIPPER=1 pod update --silent" + "pods-install": "[ \"$(uname)\" != Darwin ] || NO_FLIPPER=1 yarn pod-install", + "pods-update": "[ \"$(uname)\" != Darwin ] || cd ios && NO_FLIPPER=1 pod update --silent" }, "dependencies": { "@types/react": "^18.0.0", From 56bbadbeffa615d5f00df1c489ece949f1cd9bb0 Mon Sep 17 00:00:00 2001 From: Lukas Knoch-Girstmair Date: Wed, 13 Nov 2024 14:43:42 +0100 Subject: [PATCH 2/4] Null safe check if `isBackgroundPlaybackEnabled` property is set --- .../java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt b/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt index 842c945f..cc6fef11 100644 --- a/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt +++ b/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt @@ -248,7 +248,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple val playbackConfig = playerConfig?.getMap("playbackConfig") val isPictureInPictureEnabled = view.config?.pictureInPictureConfig?.isEnabled == true || playbackConfig?.getBooleanOrNull("isPictureInPictureEnabled") == true - view.enableBackgroundPlayback = playbackConfig?.getBoolean("isBackgroundPlaybackEnabled") ?: false + view.enableBackgroundPlayback = playbackConfig?.getBooleanOrNull("isBackgroundPlaybackEnabled") == true val rnStyleConfigWrapper = playerConfig?.toRNStyleConfigWrapperFromPlayerConfig() val configuredPlayerViewConfig = view.config?.playerViewConfig ?: PlayerViewConfig() From 375c00b531cfd2262362eee65ad51c7c082f56ea Mon Sep 17 00:00:00 2001 From: Lukas Knoch-Girstmair Date: Wed, 13 Nov 2024 14:50:56 +0100 Subject: [PATCH 3/4] Add changelog entry --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d058a09b..4346b632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased] + +### Fixed + +- Error where setting `PlaybackConfig.isAutoplayEnabled = true` causes the player view creation to fail on Android + ## [0.31.0] - 2024-11-07 ### Added From f2920015d4983ace17d5bf9d683c8f68d24269cd Mon Sep 17 00:00:00 2001 From: Lukas Knoch-Girstmair Date: Wed, 13 Nov 2024 15:23:07 +0100 Subject: [PATCH 4/4] Upgrade native Android SDK version to `3.92.0` --- CHANGELOG.md | 4 ++++ android/build.gradle | 4 ++-- .../reactnative/services/MediaSessionPlaybackService.kt | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4346b632..99d7ea7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Changed + +- Update Bitmovin's native Android SDK version to `3.92.0` + ### Fixed - Error where setting `PlaybackConfig.isAutoplayEnabled = true` causes the player view creation to fail on Android diff --git a/android/build.gradle b/android/build.gradle index 37d586f7..d091538a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,6 +105,6 @@ dependencies { // Bitmovin implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0' implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' - implementation 'com.bitmovin.player:player:3.91.0+jason' - implementation 'com.bitmovin.player:player-media-session:3.91.0+jason' + implementation 'com.bitmovin.player:player:3.92.0+jason' + implementation 'com.bitmovin.player:player-media-session:3.92.0+jason' } diff --git a/android/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt b/android/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt index ff7afa28..af036da9 100644 --- a/android/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt +++ b/android/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import com.bitmovin.player.api.Player +import com.bitmovin.player.api.media.session.ControllerInfo import com.bitmovin.player.api.media.session.MediaSession import com.bitmovin.player.api.media.session.MediaSessionService @@ -29,7 +30,7 @@ class MediaSessionPlaybackService : MediaSessionService() { private val binder = ServiceBinder() private var mediaSession: MediaSession? = null - override fun onGetSession(): MediaSession? = null + override fun onGetSession(controllerInfo: ControllerInfo) = null override fun onDestroy() { disconnectSession()