[CORE-4969] Fixed small issue with starting background service

StreamAMG · Sep 26, 2024 · a809762 · a809762
1 parent 17975b7
commit a809762
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 44 deletions.
diff --git a/...k-android/src/main/java/com/streamamg/player/plugin/bitmovin/BitmovinVideoPlayerPlugin.kt b/...k-android/src/main/java/com/streamamg/player/plugin/bitmovin/BitmovinVideoPlayerPlugin.kt
@@ -76,30 +76,6 @@ class BitmovinVideoPlayerPlugin : VideoPlayerPlugin {
             }
         }
 
-        DisposableEffect(currentLifecycle) {
-            val observer = LifecycleEventObserver { _, event ->
-                when (event) {
-                    Lifecycle.Event.ON_STOP -> {
-                        playerViewModel.handleAppInBackground(context)
-                    }
-                    Lifecycle.Event.ON_START -> {
-                        playerViewModel.handleAppInForeground(context)
-                    }
-                    Lifecycle.Event.ON_PAUSE -> {
-                        playerViewModel.handleAppInBackground(context)
-                    }
-                    Lifecycle.Event.ON_RESUME -> {
-                        playerViewModel.handleAppInForeground(context)
-                    }
-                    else -> {}
-                }
-            }
-            currentLifecycle.lifecycle.addObserver(observer)
-            onDispose {
-                currentLifecycle.lifecycle.removeObserver(observer)
-            }
-        }
-
         val isReady = playerViewModel.isPlayerReady.collectAsState()
 
         key(lastHlsUrl.value) {
@@ -116,9 +92,34 @@ class BitmovinVideoPlayerPlugin : VideoPlayerPlugin {
                 update = { view ->
                     if (isReady.value) {
                         view.player = playerViewModel.player
+                        playerViewModel.updateBackgroundService(context)
                     }
                 }
             )
+
+            DisposableEffect(currentLifecycle) {
+                val observer = LifecycleEventObserver { _, event ->
+                    when (event) {
+                        Lifecycle.Event.ON_STOP -> {
+                            playerViewModel.handleAppInBackground(context)
+                        }
+                        Lifecycle.Event.ON_START -> {
+                            playerViewModel.handleAppInForeground(context)
+                        }
+                        Lifecycle.Event.ON_PAUSE -> {
+                            playerViewModel.handleAppInBackground(context)
+                        }
+                        Lifecycle.Event.ON_RESUME -> {
+                            playerViewModel.handleAppInForeground(context)
+                        }
+                        else -> {}
+                    }
+                }
+                currentLifecycle.lifecycle.addObserver(observer)
+                onDispose {
+                    currentLifecycle.lifecycle.removeObserver(observer)
+                }
+            }
         }
 
         if (fullscreen.value) {

diff --git a/...ck-sdk-android/src/main/java/com/streamamg/player/plugin/bitmovin/VideoPlayerViewModel.kt b/...ck-sdk-android/src/main/java/com/streamamg/player/plugin/bitmovin/VideoPlayerViewModel.kt
@@ -57,7 +57,7 @@ class VideoPlayerViewModel : ViewModel() {
         updateBackgroundService(context)
     }
 
-    private fun updateBackgroundService(context: Context) {
+     fun updateBackgroundService(context: Context) {
         if (backgroundPlaybackEnabled && isPermissionsGranted) {
             bindToBackgroundPlaybackService(context)
         }
@@ -68,7 +68,7 @@ class VideoPlayerViewModel : ViewModel() {
         updateBackgroundService(context)
     }
 
-    fun loadVideo(videoUrl: String) {
+    private fun loadVideo(videoUrl: String) {
         if (!urlsAreEqualExcludingKs(currentVideoUrl ?: "", videoUrl)) {
             val sourceConfig = SourceConfig.fromUrl(videoUrl)
             player?.load(sourceConfig)
@@ -101,15 +101,15 @@ class VideoPlayerViewModel : ViewModel() {
     }
 
     fun handleAppInBackground(context: Context) {
-        if (backgroundPlaybackEnabled) {
+        if (backgroundPlaybackEnabled && _isPlayerReady.value) {
             bindToBackgroundPlaybackService(context)
         } else {
             player?.pause()
         }
     }
 
     fun handleAppInForeground(context: Context) {
-        if (backgroundPlaybackEnabled) {
+        if (backgroundPlaybackEnabled && _isPlayerReady.value) {
             unbindFromService(context)
         } else if (autoplayEnabled) {
             player?.play()

diff --git a/playback-sdk-android/src/main/java/com/streamamg/player/ui/BackgroundPlaybackService.kt b/playback-sdk-android/src/main/java/com/streamamg/player/ui/BackgroundPlaybackService.kt
@@ -28,17 +28,6 @@ class BackgroundPlaybackService : Service() {
 
         private var player: Player? = null
 
-        fun setPlayer(context: Context) {
-            if (player == null) {
-                val playerConfig = PlayerConfig(key = PlaybackSDKManager.bitmovinLicense)
-                player = Player(context, playerConfig)
-            }
-        }
-
-        fun setPlayer(player: Player) {
-            this.player = player
-        }
-
         fun releasePlayer() {
             player?.destroy()
             player = null
@@ -82,8 +71,6 @@ class BackgroundPlaybackService : Service() {
     override fun onCreate() {
         super.onCreate()
 
-//        setPlayer(this)
-
         // Create a PlayerNotificationManager with the static create method
         // By passing null for the mediaDescriptionAdapter, a DefaultMediaDescriptionAdapter will be used internally.
         playerNotificationManager = PlayerNotificationManager.createWithNotificationChannel(
@@ -107,9 +94,6 @@ class BackgroundPlaybackService : Service() {
                     stopSelf()
                 }
             })
-
-            // Attaching the Player to the PlayerNotificationManager
-//            setPlayer(sharedPlayer)
         }
     }