From 9c5b6d8207ff3b5f94aa5bb44f0ab848aee5e7b6 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 21:11:00 +0200
Subject: [PATCH] Fix null voiceBroadcastId when the playlist is empty

---
 .../features/voicebroadcast/VoiceBroadcastPlayer.kt    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 9c118f957d..28ed7a58b8 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -30,7 +30,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.events.model.RelationType
-import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
@@ -73,8 +72,7 @@ class VoiceBroadcastPlayer @Inject constructor(
     private var currentSequence: Int? = null
 
     private var playlist = emptyList<MessageAudioEvent>()
-    val currentVoiceBroadcastId
-        get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
+    var currentVoiceBroadcastId: String? = null
 
     private var state: State = State.IDLE
         set(value) {
@@ -128,6 +126,7 @@ class VoiceBroadcastPlayer @Inject constructor(
         playlist = emptyList()
         currentSequence = null
         currentRoomId = null
+        currentVoiceBroadcastId = null
     }
 
     fun addListener(listener: Listener) {
@@ -141,11 +140,12 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     private fun startPlayback(roomId: String, eventId: String) {
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
-        currentRoomId = roomId
-
         // Stop listening previous voice broadcast if any
         if (state != State.IDLE) stop()
 
+        currentRoomId = roomId
+        currentVoiceBroadcastId = eventId
+
         state = State.BUFFERING
 
         val voiceBroadcastState = getVoiceBroadcastUseCase.execute(roomId, eventId)?.content?.voiceBroadcastState