From 6654f6aa7472b1b30800ccbcf3d7af05fe074ee9 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Mon, 17 Jul 2023 11:41:02 -0500 Subject: [PATCH] WIP Signed-off-by: rapterjet2004 --- .../adapters/messages/IncomingVoiceMessageViewHolder.kt | 2 +- .../adapters/messages/OutcomingVoiceMessageViewHolder.kt | 2 +- .../main/java/com/nextcloud/talk/chat/ChatActivity.kt | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt index 9b047bcbe4..07db5eca82 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -101,7 +101,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : setParentMessageDataOnMessageItem(message) updateDownloadState(message) - binding.seekbar.max = message.voiceMessageDuration + binding.seekbar.max = message.voiceMessageDuration - 1 viewThemeUtils.platform.themeHorizontalSeekBar(binding.seekbar) viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar, ColorRole.ON_SURFACE_VARIANT) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt index aa6b90d22c..4da9a1cd99 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt @@ -98,7 +98,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) : setParentMessageDataOnMessageItem(message) updateDownloadState(message) - binding.seekbar.max = message.voiceMessageDuration + binding.seekbar.max = message.voiceMessageDuration - 1 viewThemeUtils.platform.themeHorizontalSeekBar(binding.seekbar) viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar, ColorRole.ON_SURFACE_VARIANT) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index fc03dd2bd2..1a5e1c6c02 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1715,18 +1715,17 @@ class ChatActivity : mediaPlayerHandler = Handler() runOnUiThread(object : Runnable { - var timeElapsed = if (message.voiceMessagePlayedSeconds > 0) message.voiceMessagePlayedSeconds else 0 override fun run() { if (mediaPlayer != null) { if (message.isPlayingVoiceMessage) { - if (timeElapsed < (mediaPlayer!!.duration / VOICE_MESSAGE_SEEKBAR_BASE)) { - timeElapsed += 1 - message.voiceMessagePlayedSeconds = timeElapsed + val pos = mediaPlayer!!.currentPosition / VOICE_MESSAGE_SEEKBAR_BASE + if (pos < (mediaPlayer!!.duration / VOICE_MESSAGE_SEEKBAR_BASE)) { + message.voiceMessagePlayedSeconds = pos adapter?.update(message) } else { message.resetVoiceMessage = true + message.voiceMessagePlayedSeconds = 0 adapter?.update(message) - timeElapsed = 0 stopMediaPlayer(message) } }