Skip to content

Audio tweaks #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasSession merged 5 commits into from
Feb 11, 2026
Merged

Audio tweaks #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e23aae
Making sure we display the duration of an audio message right away
ThomasSession Feb 10, 2026
33680a4
SES-4108 - addressing outgoing audio duration in details activity
ThomasSession Feb 11, 2026
f20f0ef
Idle state needs to remember the chosen playback speed
ThomasSession Feb 11, 2026
f066b4c
SES-5213 - MEssage details: File ID should not be the filename but th…
ThomasSession Feb 11, 2026
d01bfd2
Merge branch 'dev' into fix/audio-issues
ThomasSession Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/org/thoughtcrime/securesms/audio/AudioPlaybackManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class AudioPlaybackManager @Inject constructor(
private val TAG = "AudioPlaybackManager"

private val _playbackState =
MutableStateFlow<AudioPlaybackState>(AudioPlaybackState.Idle)
MutableStateFlow<AudioPlaybackState>(AudioPlaybackState.Idle(1f))
val playbackState: StateFlow<AudioPlaybackState> = _playbackState.asStateFlow()

// Keeping certain aspect different from the state, like audio ending, which is more an event
Expand Down Expand Up @@ -156,8 +156,10 @@ class AudioPlaybackManager @Inject constructor(
stopProgressTracking()
controller?.stop()
controller?.clearMediaItems()

val speed = currentPlayable?.let { getSavedState(it.messageId).playbackSpeed } ?: 1f
currentPlayable = null
_playbackState.value = AudioPlaybackState.Idle
_playbackState.value = AudioPlaybackState.Idle(speed)
}

fun seekTo(positionMs: Long) {
Expand Down Expand Up @@ -385,7 +387,9 @@ class AudioPlaybackManager @Inject constructor(
false
)
} else {
AudioPlaybackState.Idle
AudioPlaybackState.Idle(
saved.playbackSpeed
)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/audio/model/AudioPlaybackState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sealed class AudioPlaybackState(
}
}

data object Idle : AudioPlaybackState(1f)
data class Idle(override val playbackSpeed: Float = 1f) : AudioPlaybackState(playbackSpeed)

sealed class Active(
open val playable: PlayableAudio,
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class MessageDetailsViewModel @AssistedInject constructor(

private val Slide.details: List<TitledText>
get() = listOfNotNull(
TitledText(R.string.attachmentsFileId, filename),
TitledText(R.string.attachmentsFileId, asAttachment().location), //File ID isn't the filename but the ID on the file server
TitledText(R.string.attachmentsFileType, asAttachment().contentType),
TitledText(R.string.attachmentsFileSize, Formatter.formatFileSize(context, fileSize)),
takeIf { it is ImageSlide }
Expand All @@ -235,7 +235,10 @@ class MessageDetailsViewModel @AssistedInject constructor(
private fun AttachmentDatabase.duration(slide: Slide): String? =
slide.takeIf { it.hasAudio() }
?.run { asAttachment() as? DatabaseAttachment }
?.run { getAttachmentAudioExtras(attachmentId)?.durationMs }
?.run {
getAttachmentAudioExtras(attachmentId)?.durationMs
?: this.audioDurationMs
}
?.takeIf { it > 0 }
?.let {
String.format(
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,12 @@ class VoiceMessageView @JvmOverloads constructor(
binding.voiceMessageSpeedButton.setTextColor(textColor)
}

// text
// duration
this.durationMs = playable?.durationMs?.coerceAtLeast(0) ?: 0L
binding.voiceMessageViewDurationTextView.text =
MediaUtil.getFormattedVoiceMessageDuration(this.durationMs)

// title
binding.audioTitle.text = if(playable?.isVoiceNote == true) context.getString(R.string.messageVoice)
else playable?.filename ?: context.getString(R.string.unknown)

Expand Down Expand Up @@ -194,7 +199,7 @@ class VoiceMessageView @JvmOverloads constructor(
is AudioPlaybackState.Idle -> {
isPlaying = false
binding.voiceMessageViewLoader.isVisible = false
updateSeekBar(0, 0) // Reset
updateSeekBar(0, this.durationMs) // Reset
renderIcon()
}
is AudioPlaybackState.Active.Loading -> {
Expand Down