From 400118ed3ec8eb19bb4ba6011f5b3f5c6c0816b7 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Tue, 18 Oct 2022 13:03:57 +0200 Subject: [PATCH] Remove useless Android API checks --- .../app/features/voice/AbstractVoiceRecorderQ.kt | 12 ++---------- .../usecase/StopVoiceBroadcastUseCase.kt | 5 +---- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt index 428b3c578b..0d8373870f 100644 --- a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt +++ b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt @@ -91,11 +91,7 @@ abstract class AbstractVoiceRecorderQ(private val context: Context) : AbstractVo fun setNextOutputFile(roomId: String) { val mediaRecorder = mediaRecorder ?: return nextOutputFile = createOutputFile(roomId) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - mediaRecorder.setNextOutputFile(nextOutputFile) - } else { - mediaRecorder.setNextOutputFile(nextOutputFile?.outputStream()?.fd) - } + mediaRecorder.setNextOutputFile(nextOutputFile) } private fun createMediaRecorder(): MediaRecorder { @@ -115,10 +111,6 @@ abstract class AbstractVoiceRecorderQ(private val context: Context) : AbstractVo private fun setOutputFile(roomId: String) { val mediaRecorder = mediaRecorder ?: return outputFile = outputFile ?: createOutputFile(roomId) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - mediaRecorder.setOutputFile(outputFile) - } else { - mediaRecorder.setOutputFile(outputFile?.outputStream()?.fd) - } + mediaRecorder.setOutputFile(outputFile) } } diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt index 85ffde0d02..6eefa06979 100644 --- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt +++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt @@ -16,7 +16,6 @@ package im.vector.app.features.voicebroadcast.usecase -import android.os.Build import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent @@ -68,8 +67,6 @@ class StopVoiceBroadcastUseCase @Inject constructor( } private fun stopRecording() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - voiceBroadcastRecorder?.stopRecord() - } + voiceBroadcastRecorder?.stopRecord() } }