Merge pull request #43 from edx/2U/omer/LEARNER-10178

fix: Casting method update + crash fix
edx · Sep 4, 2024 · b28b6e2 · b28b6e2
2 parents 0dc3065 + 4f18de1
commit b28b6e2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/EncodedVideoUnitViewModel.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/EncodedVideoUnitViewModel.kt
@@ -104,10 +104,8 @@ class EncodedVideoUnitViewModel(
         initPlayer()
 
         val executor = Executors.newSingleThreadExecutor()
-        CastContext.getSharedInstance(context, executor).addOnCompleteListener {
-            it.result?.let { castContext ->
-                castPlayer = CastPlayer(castContext)
-            }
+        CastContext.getSharedInstance(context, executor).result?.let { castContext ->
+            castPlayer = CastPlayer(castContext)
         }
     }
 
@@ -119,8 +117,12 @@ class EncodedVideoUnitViewModel(
 
     override fun onPause(owner: LifecycleOwner) {
         super.onPause(owner)
-        exoPlayer?.removeListener(exoPlayerListener)
-        exoPlayer?.pause()
+        if (isCastActive) {
+            getActivePlayer()?.release()
+        } else {
+            exoPlayer?.removeListener(exoPlayerListener)
+            exoPlayer?.pause()
+        }
     }
 
     fun getActivePlayer(): Player? {