From 9a93b375f37bdec866b21965438712e312ef30f8 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 12 Nov 2022 22:29:22 +0100
Subject: [PATCH] Fixed: Lock when switching episodes Lock on RTL layouts
 Skipping to the next season

---
 .../cloudstream3/ui/player/FullScreenPlayer.kt       |  2 +-
 .../cloudstream3/ui/result/ResultViewModel2.kt       | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 0f9a6548..509c2187 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -612,6 +612,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         //player_media_route_button?.isClickable = !isGone
         player_go_back_holder?.isGone = isGone
         player_sources_btt?.isGone = isGone
+        player_skip_episode?.isGone = isGone
     }
 
     private fun updateLockUI() {
@@ -1101,7 +1102,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     protected fun uiReset() {
-        isLocked = false
         isShowing = false
 
         // if nothing has loaded these buttons should not be visible
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 0c26f69c..da900b0a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1582,7 +1582,6 @@ class ResultViewModel2 : ViewModel() {
             return
         }
 
-        val episodes = currentEpisodes[indexer]
         val ranges = currentRanges[indexer]
 
         if (ranges?.contains(range) != true) {
@@ -1594,7 +1593,6 @@ class ResultViewModel2 : ViewModel() {
             }
         }
 
-        val size = episodes?.size
         val isMovie = currentResponse?.isMovie() == true
         currentIndex = indexer
         currentRange = range
@@ -1604,6 +1602,7 @@ class ResultViewModel2 : ViewModel() {
             text to r
         } ?: emptyList())
 
+        val size = currentEpisodes[indexer]?.size
         _episodesCountText.postValue(
             some(
                 if (isMovie) null else
@@ -1683,9 +1682,12 @@ class ResultViewModel2 : ViewModel() {
         generator = if (isMovie) {
             getMovie()?.let { RepoLinkGenerator(listOf(it), page = currentResponse) }
         } else {
-            episodes?.let { list ->
-                RepoLinkGenerator(list, page = currentResponse)
-            }
+            val episodes = currentEpisodes.filter { it.key.dubStatus == indexer.dubStatus }
+                .toList()
+                .sortedBy { it.first.season }
+                .flatMap { it.second }
+
+            RepoLinkGenerator(episodes, page = currentResponse)
         }
 
         if (isMovie) {