fix vod chat double messages

(cherry picked from commit ca3d443)
crackededed · Dec 10, 2024 · 14a5fd9 · 14a5fd9
1 parent b3065df
commit 14a5fd9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,7 +29,7 @@ android {
         minSdk = 16
         targetSdk = 35
         versionCode = 121
-        versionName = "2.40.0"
+        versionName = "2.40.1"
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ChatReplayManager.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ChatReplayManager.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
@@ -116,9 +117,7 @@ class ChatReplayManager @Inject constructor(
     }
 
     private fun startJob() {
-        coroutineScope.launch(Dispatchers.IO) {
-            messageJob?.join()
-            messageJob = this as Job
+        messageJob = coroutineScope.launch(Dispatchers.IO) {
             while (isActive) {
                 val message = list.firstOrNull() ?: break
                 if (message.offsetSeconds != null) {
@@ -127,6 +126,9 @@ class ChatReplayManager @Inject constructor(
                     while (((runBlocking(Dispatchers.Main) { getCurrentPosition() } ?: 0).also { lastCheckedPosition = it } + startTime).also { currentPosition = it } < messageOffset) {
                         delay(max((messageOffset - currentPosition).div(playbackSpeed ?: 1f).toLong(), 0))
                     }
+                    if (!isActive) {
+                        break
+                    }
                     messageListener.onMessage(ChatMessage(
                         id = message.id,
                         userId = message.userId,
@@ -142,7 +144,7 @@ class ChatReplayManager @Inject constructor(
                     if (list.size <= 25 && !cursor.isNullOrBlank() && !isLoading) {
                         load()
                     }
-                }
+                } else if (!isActive) break
                 list.remove(message)
             }
         }

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ChatReplayManagerLocal.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ChatReplayManagerLocal.kt
@@ -66,6 +66,9 @@ class ChatReplayManagerLocal @Inject constructor(
                     while (((runBlocking(Dispatchers.Main) { getCurrentPosition() } ?: 0).also { lastCheckedPosition = it } + startTime).also { currentPosition = it } < messageOffset) {
                         delay(max((messageOffset - currentPosition).div(playbackSpeed ?: 1f).toLong(), 0))
                     }
+                    if (!isActive) {
+                        break
+                    }
                     messageListener.onMessage(ChatMessage(
                         id = message.id,
                         userId = message.userId,
@@ -83,7 +86,7 @@ class ChatReplayManagerLocal @Inject constructor(
                         reward = message.reward,
                         fullMsg = message.fullMsg
                     ))
-                }
+                } else if (!isActive) break
                 list.remove(message)
             }
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,11 +14,11 @@ draglistview = "1.7.3"
 fragment = "1.8.5"
 glide = "4.16.0"
 glide-webpdecoder = "2.6.4.16.0"
-hilt = "2.52"
+hilt = "2.53.1"
 hilt-extension-compiler = "1.2.0"
 hilt-work = "1.2.0"
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.26"
+kotlin = "2.1.0"
+ksp = "2.1.0-1.0.29"
 lifecycle = "2.8.7"
 material = "1.12.0"
 media3 = "1.5.0"