Add stop recorder tracker

element-hq · Apr 12, 2023 · 2506d95 · 2506d95
1 parent e6b1921
commit 2506d95
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/vector/src/main/java/im/vector/app/core/di/VoiceModule.kt b/vector/src/main/java/im/vector/app/core/di/VoiceModule.kt
@@ -42,14 +42,12 @@ abstract class VoiceModule {
                 context: Context,
                 sessionHolder: ActiveSessionHolder,
                 getVoiceBroadcastStateEventLiveUseCase: GetVoiceBroadcastStateEventLiveUseCase,
-                playbackTracker: AudioMessagePlaybackTracker
         ): VoiceBroadcastRecorder? {
             return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 VoiceBroadcastRecorderQ(
                         context = context,
                         sessionHolder = sessionHolder,
-                        getVoiceBroadcastEventUseCase = getVoiceBroadcastStateEventLiveUseCase,
-                        playbackTracker = playbackTracker
+                        getVoiceBroadcastEventUseCase = getVoiceBroadcastStateEventLiveUseCase
                 )
             } else {
                 null

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
@@ -239,7 +239,7 @@ class AudioMessageHelper @Inject constructor(
             val percentage = currentPosition.toFloat() / totalDuration
             playbackTracker.updatePlayingAtPlaybackTime(id, currentPosition, percentage)
         } else {
-            playbackTracker.stopPlayback(id)
+            playbackTracker.stopPlaybackOrRecorder(id)
             stopPlaybackTicker()
         }
     }

diff --git a/...va/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt b/...va/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt
@@ -100,7 +100,7 @@ class AudioMessagePlaybackTracker @Inject constructor() {
         }
     }
 
-    fun stopPlayback(id: String) {
+    fun stopPlaybackOrRecorder(id: String) {
         val state = getPlaybackState(id)
         if (state !is Listener.State.Error) {
             setState(id, Listener.State.Idle)

diff --git a/...src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt b/...src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
@@ -527,7 +527,7 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
                 State.Idle -> {
                     // restart the playback time if player completed with less than 1s remaining time
                     if (percentage == null || (playlist.duration - position) < 1000) {
-                        playbackTracker.stopPlayback(id)
+                        playbackTracker.stopPlaybackOrRecorder(id)
                     } else {
                         playbackTracker.updatePausedAtPlaybackTime(id, position, percentage)
                     }

diff --git a/.../src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorderQ.kt b/.../src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorderQ.kt
@@ -21,7 +21,6 @@ import android.media.MediaRecorder
 import android.os.Build
 import androidx.annotation.RequiresApi
 import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.voice.AbstractVoiceRecorderQ
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
@@ -45,8 +44,7 @@ import java.util.concurrent.TimeUnit
 class VoiceBroadcastRecorderQ(
         context: Context,
         private val sessionHolder: ActiveSessionHolder,
-        private val getVoiceBroadcastEventUseCase: GetVoiceBroadcastStateEventLiveUseCase,
-        private val playbackTracker: AudioMessagePlaybackTracker
+        private val getVoiceBroadcastEventUseCase: GetVoiceBroadcastStateEventLiveUseCase
 ) : AbstractVoiceRecorderQ(context), VoiceBroadcastRecorder {
 
     private val session get() = sessionHolder.getActiveSession()
@@ -105,7 +103,6 @@ class VoiceBroadcastRecorderQ(
 
     override fun startRecord(roomId: String) {
         super.startRecord(roomId)
-        playbackTracker.updateCurrentRecording(AudioMessagePlaybackTracker.RECORDING_ID, emptyList())
         observeConnectionState()
     }
 

diff --git a/...ava/im/vector/app/features/voicebroadcast/recording/usecase/StartVoiceBroadcastUseCase.kt b/...ava/im/vector/app/features/voicebroadcast/recording/usecase/StartVoiceBroadcastUseCase.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import androidx.core.content.FileProvider
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.attachments.toContentAttachmentData
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
 import im.vector.app.features.voicebroadcast.VoiceBroadcastFailure
@@ -54,6 +55,7 @@ import javax.inject.Inject
 class StartVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
         private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+        private val playbackTracker: AudioMessagePlaybackTracker,
         private val context: Context,
         private val buildMeta: BuildMeta,
         private val getRoomLiveVoiceBroadcastsUseCase: GetRoomLiveVoiceBroadcastsUseCase,
@@ -106,10 +108,14 @@ class StartVoiceBroadcastUseCase @Inject constructor(
             }
 
             override fun onStateUpdated(state: VoiceBroadcastRecorder.State) {
-                if (state == VoiceBroadcastRecorder.State.Error) {
-                    session.coroutineScope.launch {
-                        pauseVoiceBroadcastUseCase.execute(room.roomId)
+                when (state) {
+                    VoiceBroadcastRecorder.State.Recording -> playbackTracker.updateCurrentRecording(AudioMessagePlaybackTracker.RECORDING_ID, emptyList())
+                    VoiceBroadcastRecorder.State.Idle -> playbackTracker.stopPlaybackOrRecorder(AudioMessagePlaybackTracker.RECORDING_ID)
+                    VoiceBroadcastRecorder.State.Error -> {
+                        playbackTracker.stopPlaybackOrRecorder(AudioMessagePlaybackTracker.RECORDING_ID)
+                        session.coroutineScope.launch { pauseVoiceBroadcastUseCase.execute(room.roomId) }
                     }
+                    else -> Unit
                 }
             }
         })

diff --git a/...test/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCaseTest.kt b/...test/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCaseTest.kt
@@ -57,6 +57,7 @@ class StartVoiceBroadcastUseCaseTest {
             StartVoiceBroadcastUseCase(
                     session = fakeSession,
                     voiceBroadcastRecorder = fakeVoiceBroadcastRecorder,
+                    playbackTracker = mockk(),
                     context = FakeContext().instance,
                     buildMeta = mockk(),
                     getRoomLiveVoiceBroadcastsUseCase = fakeGetRoomLiveVoiceBroadcastsUseCase,