From 2edd9bcc061a345bd41b73e4416d7c53d47878a2 Mon Sep 17 00:00:00 2001 From: evgeny Date: Wed, 29 Jul 2026 02:03:09 +0300 Subject: [PATCH] cleanup: remove dead currentPlayPath, fix seekVoice _currentPlayingPath reset - AudioRecorderManager: removed unused currentPlayPath (duplicate of ViewModel state) - ChatViewModel: seekVoice now resets _currentPlayingPath on complete (prevents pause-on-already-ended after seek finishes) --- .../src/main/java/com/utun/chat/data/AudioRecorderManager.kt | 5 ++--- .../src/main/java/com/utun/chat/viewmodel/ChatViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/AudioRecorderManager.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/AudioRecorderManager.kt index 15abedd5..4ee14b23 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/AudioRecorderManager.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/AudioRecorderManager.kt @@ -185,7 +185,6 @@ class AudioRecorderManager { @Volatile var elapsedMs: Int = 0; private set var pausedElapsedMs: Int = 0; private set private var playThread: Thread? = null - private var currentPlayPath: String? = null fun playVoiceFile(filePath: String, onProgress: ((Float) -> Unit)? = null, onComplete: () -> Unit = {}) { playFromPosition(filePath, 0, onProgress, onComplete) @@ -193,7 +192,7 @@ class AudioRecorderManager { fun playFromPosition(filePath: String, startMs: Int, onProgress: ((Float) -> Unit)? = null, onComplete: () -> Unit = {}) { stopPlayback() - isPaused = false; elapsedMs = startMs; playing = true; currentPlayPath = filePath + isPaused = false; elapsedMs = startMs; playing = true playThread = Thread { try { @@ -246,7 +245,7 @@ class AudioRecorderManager { } catch (e: Exception) { LogManager.addLog("ERROR", "AudioPlayer", "play error: ${e.message}") } - playing = false; isPaused = false; currentPlayPath = null + playing = false; isPaused = false onComplete() }.apply { start() } } diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/viewmodel/ChatViewModel.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/viewmodel/ChatViewModel.kt index d6008248..7b7f9ce9 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/viewmodel/ChatViewModel.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/viewmodel/ChatViewModel.kt @@ -285,7 +285,7 @@ class ChatViewModel : ViewModel() { fun seekVoice(filePath: String, seekMs: Int, onDone: () -> Unit) { audioRecorder.stopPlayback() _currentPlayingPath = filePath - audioRecorder.playFromPosition(filePath, seekMs, onComplete = onDone) + audioRecorder.playFromPosition(filePath, seekMs, onComplete = { _currentPlayingPath = null; onDone() }) } fun clearState() {