fix: crash after rotating device in open content

openedx · Mar 8, 2024 · 47855f0 · 47855f0
1 parent d38625a
commit 47855f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt
@@ -118,7 +118,7 @@ class HtmlUnitFragment : Fragment() {
                                 },
                                 onWebPageLoaded = {
                                     isLoading = false
-                                    viewModel.setWebPageLoaded(requireContext().assets)
+                                    if (isAdded) viewModel.setWebPageLoaded(requireContext().assets)
                                 }
                             )
                         } else {

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
@@ -80,9 +80,11 @@ class EncodedVideoUnitViewModel(
         initPlayer()
 
         val executor = Executors.newSingleThreadExecutor()
-        castContext = CastContext.getSharedInstance(context, executor).result
-        castContext?.let {
-            castPlayer = CastPlayer(it)
+        CastContext.getSharedInstance(context, executor).addOnCompleteListener {
+            it.result?.let { castContext ->
+                this.castContext = castContext
+                castPlayer = CastPlayer(castContext)
+            }
         }
     }