fix: player lifecycle

anilibria · Dec 27, 2022 · 1bb4e0b · 1bb4e0b
1 parent 2b2aa6d
commit 1bb4e0b
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/app-mobile/src/main/java/ru/radiationx/anilibria/ui/activities/MyPlayerActivity.kt b/app-mobile/src/main/java/ru/radiationx/anilibria/ui/activities/MyPlayerActivity.kt
@@ -36,6 +36,7 @@ import com.devbrackets.android.exomedia.ui.widget.VideoControlsCore
 import com.google.android.exoplayer2.ExoPlaybackException
 import com.google.android.exoplayer2.analytics.AnalyticsListener
 import com.google.android.exoplayer2.source.MediaSourceEventListener
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.runBlocking
@@ -162,6 +163,8 @@ class MyPlayerActivity : BaseActivity(R.layout.activity_myplayer) {
 
     private var pictureInPictureParams: PictureInPictureParams.Builder? = null
 
+    private var releaseDataJob: Job? = null
+
     private fun getStatisticByDomain(host: String): MutableList<Pair<AnalyticsQuality, Long>> {
         if (!loadingStatistics.contains(host)) {
             loadingStatistics[host] = mutableListOf()
@@ -305,10 +308,6 @@ class MyPlayerActivity : BaseActivity(R.layout.activity_myplayer) {
         }
         handleIntent(intent)
         updateUiFlags()
-
-        releaseInteractor.observeFull(releaseData.id, releaseData.code).onEach {
-            releaseData = it
-        }.launchIn(lifecycleScope)
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -346,7 +345,10 @@ class MyPlayerActivity : BaseActivity(R.layout.activity_myplayer) {
         binding.player.setOnCompletionListener(null)
         binding.player.setOnVideoSizedChangedListener(null)
         binding.player.setAnalyticsListener(null)
-        unregisterReceiver(mReceiver)
+        try {
+            unregisterReceiver(mReceiver)
+        } catch (ignore: Exception) {
+        }
 
         videoControls?.apply {
             setOpeningListener(null)
@@ -401,6 +403,11 @@ class MyPlayerActivity : BaseActivity(R.layout.activity_myplayer) {
         this.currentEpisodeId = episodeId
         this.currentQuality = quality
         this.playFlag = playFlag
+
+        releaseDataJob?.cancel()
+        releaseDataJob = releaseInteractor.observeFull(releaseData.id, releaseData.code).onEach {
+            releaseData = it
+        }.launchIn(lifecycleScope)
     }
 
     private fun handleIntent(intent: Intent) {