From 3663f225905aabdfaa73550224cf210d6616fa96 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 10 Jan 2023 15:16:25 +0100
Subject: [PATCH] Handle download error during playback

---
 .../listening/VoiceBroadcastPlayerImpl.kt     | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
index 538b2f8da4..ab4b6c2269 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
@@ -206,15 +206,19 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
         val sequence = playlistItem.sequence ?: run { Timber.w("## Voice Broadcast | Playlist item has no sequence"); return }
         val sequencePosition = position - playlistItem.startTime
         sessionScope.launch {
-            prepareMediaPlayer(content) { mp ->
-                currentMediaPlayer = mp
-                playlist.currentSequence = sequence
-                mp.start()
-                if (sequencePosition > 0) {
-                    mp.seekTo(sequencePosition)
+            try {
+                prepareMediaPlayer(content) { mp ->
+                    currentMediaPlayer = mp
+                    playlist.currentSequence = sequence
+                    mp.start()
+                    if (sequencePosition > 0) {
+                        mp.seekTo(sequencePosition)
+                    }
+                    playingState = State.Playing
+                    prepareNextMediaPlayer()
                 }
-                playingState = State.Playing
-                prepareNextMediaPlayer()
+            } catch (failure: VoiceBroadcastFailure.ListeningError.DownloadError) {
+                playingState = State.Error(failure)
             }
         }
     }
@@ -259,20 +263,27 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
         if (nextItem != null) {
             isPreparingNextPlayer = true
             sessionScope.launch {
-                prepareMediaPlayer(nextItem.audioEvent.content) { mp ->
+                try {
+                    prepareMediaPlayer(nextItem.audioEvent.content) { mp ->
+                        isPreparingNextPlayer = false
+                        nextMediaPlayer = mp
+                        when (playingState) {
+                            State.Playing,
+                            State.Paused -> {
+                                currentMediaPlayer?.setNextMediaPlayer(mp)
+                            }
+                            State.Buffering -> {
+                                mp.start()
+                                onNextMediaPlayerStarted(mp)
+                            }
+                            is State.Error,
+                            State.Idle -> stopPlayer()
+                        }
+                    }
+                } catch (failure: VoiceBroadcastFailure.ListeningError.DownloadError) {
                     isPreparingNextPlayer = false
-                    nextMediaPlayer = mp
-                    when (playingState) {
-                        State.Playing,
-                        State.Paused -> {
-                            currentMediaPlayer?.setNextMediaPlayer(mp)
-                        }
-                        State.Buffering -> {
-                            mp.start()
-                            onNextMediaPlayerStarted(mp)
-                        }
-                        is State.Error,
-                        State.Idle -> stopPlayer()
+                    if (playingState == State.Buffering || tryOrNull { currentMediaPlayer?.isPlaying } != true) {
+                        playingState = State.Error(failure)
                     }
                 }
             }