Trigger play/pause/resume/stop actions on VoiceRecorder

vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt

@@ -114,8 +114,13 @@ class AudioMessageHelper @Inject constructor(
      * When entering in playback mode actually.
      */
     fun pauseRecording() {
-        voiceRecorder.stopRecord()
-        stopRecordingAmplitudes()
+        voiceRecorder.pauseRecord()
+        pauseRecordingAmplitudes()
+    }
+
+    fun resumeRecording() {
+        voiceRecorder.resumeRecord()
+        resumeRecordingAmplitudes()
     }
 
     fun deleteRecording() {
@@ -221,6 +226,14 @@ class AudioMessageHelper @Inject constructor(
         }
     }
 
+    private fun pauseRecordingAmplitudes() {
+        amplitudeTicker?.pause()
+    }
+
+    private fun resumeRecordingAmplitudes() {
+        amplitudeTicker?.resume()
+    }
+
     private fun stopRecordingAmplitudes() {
         amplitudeTicker?.stop()
         amplitudeTicker = null

vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt

@@ -32,7 +32,7 @@ abstract class AbstractVoiceRecorder(
 ) : VoiceRecorder {
     private val outputDirectory: File by lazy { ensureAudioDirectory(context) }
 
-    private var mediaRecorder: MediaRecorder? = null
+    protected var mediaRecorder: MediaRecorder? = null
     private var outputFile: File? = null
 
     abstract fun setOutputFormat(mediaRecorder: MediaRecorder)
@@ -79,8 +79,8 @@ abstract class AbstractVoiceRecorder(
     }
 
     override fun stopRecord() {
-        // Can throw when the record is less than 1 second.
         mediaRecorder?.let {
+            // Can throw when the record is less than 1 second.
             tryOrNull { it.stop() }
             it.reset()
             it.release()

vector/src/main/java/im/vector/app/features/voice/VoiceRecorder.kt

@@ -34,6 +34,16 @@ interface VoiceRecorder {
      */
     fun startRecord(roomId: String)
 
+    /**
+     * Pause the recording.
+     */
+    fun pauseRecord()
+
+    /**
+     * Resume the recording.
+     */
+    fun resumeRecord()
+
     /**
      * Stop the recording.
      */

vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt

@@ -23,6 +23,7 @@ import android.media.MediaRecorder
 import android.media.audiofx.AutomaticGainControl
 import android.media.audiofx.NoiseSuppressor
 import android.os.Build
+import android.widget.Toast
 import io.element.android.opusencoder.OggOpusEncoder
 import io.element.android.opusencoder.configuration.SampleRate
 import kotlinx.coroutines.CoroutineScope
@@ -40,7 +41,7 @@ import kotlin.coroutines.CoroutineContext
  * VoiceRecorder to be used on Android versions < [Build.VERSION_CODES.Q]. It uses libopus to record ogg files.
  */
 class VoiceRecorderL(
-        context: Context,
+        private val context: Context,
         coroutineContext: CoroutineContext,
         private val codec: OggOpusEncoder,
 ) : VoiceRecorder {
@@ -112,6 +113,14 @@ class VoiceRecorderL(
         }
     }
 
+    override fun pauseRecord() {
+        Toast.makeText(context, "Not implemented for this Android version", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun resumeRecord() {
+        Toast.makeText(context, "Not implemented for this Android version", Toast.LENGTH_SHORT).show()
+    }
+
     override fun stopRecord() {
         val recorder = this.audioRecorder ?: return
         recordingJob?.cancel()

vector/src/main/java/im/vector/app/features/voice/VoiceRecorderQ.kt

@@ -20,12 +20,23 @@ import android.content.Context
 import android.media.MediaRecorder
 import android.os.Build
 import androidx.annotation.RequiresApi
+import org.matrix.android.sdk.api.extensions.tryOrNull
 
 /**
  * VoiceRecorder to be used on Android versions >= [Build.VERSION_CODES.Q]. It uses the native OPUS support on Android 10+.
  */
 @RequiresApi(Build.VERSION_CODES.Q)
 class VoiceRecorderQ(context: Context) : AbstractVoiceRecorder(context, "ogg") {
+
+    override fun pauseRecord() {
+        // Can throw when the record is less than 1 second.
+        tryOrNull { mediaRecorder?.pause() }
+    }
+
+    override fun resumeRecord() {
+        mediaRecorder?.resume()
+    }
+
     override fun setOutputFormat(mediaRecorder: MediaRecorder) {
         // We can directly use OGG here
         mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.OGG)

vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt

@@ -16,6 +16,7 @@
 
 package im.vector.app.features.voicebroadcast.usecase
 
+import im.vector.app.features.home.room.detail.composer.AudioMessageHelper
 import im.vector.app.features.voicebroadcast.STATE_ROOM_VOICE_BROADCAST_INFO
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
@@ -31,6 +32,7 @@ import javax.inject.Inject
 
 class PauseVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
+        private val audioMessageHelper: AudioMessageHelper,
 ) {
 
     suspend fun execute(roomId: String): Result<Unit> = runCatching {
@@ -60,6 +62,10 @@ class PauseVoiceBroadcastUseCase @Inject constructor(
                 ).toContent(),
         )
 
-        // TODO pause recording audio files
+        pauseRecording()
+    }
+
+    private fun pauseRecording() {
+        audioMessageHelper.pauseRecording()
     }
 }

vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/ResumeVoiceBroadcastUseCase.kt

@@ -16,6 +16,7 @@
 
 package im.vector.app.features.voicebroadcast.usecase
 
+import im.vector.app.features.home.room.detail.composer.AudioMessageHelper
 import im.vector.app.features.voicebroadcast.STATE_ROOM_VOICE_BROADCAST_INFO
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
@@ -31,6 +32,7 @@ import javax.inject.Inject
 
 class ResumeVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
+        private val audioMessageHelper: AudioMessageHelper,
 ) {
 
     suspend fun execute(roomId: String): Result<Unit> = runCatching {
@@ -65,6 +67,10 @@ class ResumeVoiceBroadcastUseCase @Inject constructor(
                 ).toContent(),
         )
 
-        // TODO resume recording audio files
+        resumeRecording()
+    }
+
+    private fun resumeRecording() {
+        audioMessageHelper.resumeRecording()
     }
 }

vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt

@@ -16,6 +16,7 @@
 
 package im.vector.app.features.voicebroadcast.usecase
 
+import im.vector.app.features.home.room.detail.composer.AudioMessageHelper
 import im.vector.app.features.voicebroadcast.STATE_ROOM_VOICE_BROADCAST_INFO
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
@@ -30,6 +31,7 @@ import javax.inject.Inject
 
 class StartVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
+        private val audioMessageHelper: AudioMessageHelper,
 ) {
 
     suspend fun execute(roomId: String): Result<Unit> = runCatching {
@@ -62,6 +64,10 @@ class StartVoiceBroadcastUseCase @Inject constructor(
                 ).toContent()
         )
 
-        // TODO start recording audio files
+        startRecording(room)
+    }
+
+    private fun startRecording(room: Room) {
+        audioMessageHelper.startRecording(room.roomId)
     }
 }

vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt

@@ -16,6 +16,7 @@
 
 package im.vector.app.features.voicebroadcast.usecase
 
+import im.vector.app.features.home.room.detail.composer.AudioMessageHelper
 import im.vector.app.features.voicebroadcast.STATE_ROOM_VOICE_BROADCAST_INFO
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
@@ -31,6 +32,7 @@ import javax.inject.Inject
 
 class StopVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
+        private val audioMessageHelper: AudioMessageHelper,
 ) {
 
     suspend fun execute(roomId: String): Result<Unit> = runCatching {
@@ -61,6 +63,10 @@ class StopVoiceBroadcastUseCase @Inject constructor(
                 ).toContent(),
         )
 
-        // TODO stop recording audio files
+        stopRecording()
+    }
+
+    private fun stopRecording() {
+        audioMessageHelper.stopRecording()
     }
 }