From 4d8a3dafe0fc7e52b4dd6569ebf8b9720941cda7 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Thu, 4 Jan 2024 16:23:40 -0500 Subject: [PATCH] Do not play end tone for individual voice memo. --- .../securesms/components/voice/VoiceNotePlayerCallback.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayerCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayerCallback.kt index e7dc6270a9..3609ef3987 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayerCallback.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayerCallback.kt @@ -204,9 +204,11 @@ class VoiceNotePlayerCallback(val context: Context, val player: VoiceNotePlayer) @MainThread private fun addItemsToPlaylist(mediaItems: List) { var mediaItemsWithNextTone = mediaItems.flatMap { listOf(it, VoiceNoteMediaItemFactory.buildNextVoiceNoteMediaItem(it)) }.toMutableList() - mediaItemsWithNextTone = mediaItemsWithNextTone.subList(0, mediaItemsWithNextTone.size - 1).toMutableList() + mediaItemsWithNextTone = mediaItemsWithNextTone.subList(0, mediaItemsWithNextTone.lastIndex).toMutableList() if (player.mediaItemCount == 0) { - mediaItemsWithNextTone += VoiceNoteMediaItemFactory.buildEndVoiceNoteMediaItem(mediaItemsWithNextTone.last()) + if (mediaItems.size > 1) { + mediaItemsWithNextTone += VoiceNoteMediaItemFactory.buildEndVoiceNoteMediaItem(mediaItemsWithNextTone.last()) + } player.addMediaItems(mediaItemsWithNextTone) } else { player.addMediaItems(player.mediaItemCount, mediaItemsWithNextTone)