Cancel in-flight delayed message jobs when manually seeking

LiveTL · May 9, 2021 · 95a9ded · 95a9ded
1 parent a196c24
commit 95a9ded
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/livetl/android/data/chat/ChatService.kt b/app/src/main/kotlin/com/livetl/android/data/chat/ChatService.kt
@@ -81,7 +81,7 @@ class ChatService(
             // Clear out messages if we seem to be manually seeking
             if (currentSecond - 10 > second || second > currentSecond + 10) {
                 Timber.d("$videoId: manual seek")
-                _messages.value = emptyList()
+                clearMessages()
             }
 
             currentSecond = second
@@ -90,8 +90,7 @@ class ChatService(
 
     fun stop() {
         webview.loadUrl("")
-        jobs.forEach { it.cancel() }
-        _messages.value = emptyList()
+        clearMessages()
     }
 
     @ExperimentalTime
@@ -156,6 +155,11 @@ class ChatService(
         Timber.d("Now: $now (${now.toDebugTimestampString()}), time: $microseconds (${microseconds.toDebugTimestampString()}), diff: $diff")
         return diff
     }
+
+    private fun clearMessages() {
+        jobs.forEach { it.cancel() }
+        _messages.value = emptyList()
+    }
 }
 
 class NoChatContinuationFoundException(videoId: String) : Exception("Continuation not found for $videoId")