fix: ANR when recording an audio

wireapp · Jun 3, 2024 · 3d797ca · 3d797ca
1 parent 00f3521
commit 3d797ca
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 24 deletions.
diff --git a/.../main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt b/.../main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt
@@ -33,6 +33,7 @@ import com.wire.android.ui.home.conversations.model.UriAsset
 import com.wire.android.util.AUDIO_MIME_TYPE
 import com.wire.android.util.CurrentScreen
 import com.wire.android.util.CurrentScreenManager
+import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.getAudioLengthInMs
 import com.wire.android.util.ui.UIText
 import com.wire.kalium.logic.feature.asset.GetAssetSizeLimitUseCase
@@ -59,7 +60,8 @@ class RecordAudioViewModel @Inject constructor(
     private val generateAudioFileWithEffects: GenerateAudioFileWithEffectsUseCase,
     private val currentScreenManager: CurrentScreenManager,
     private val audioMediaRecorder: AudioMediaRecorder,
-    private val globalDataStore: GlobalDataStore
+    private val globalDataStore: GlobalDataStore,
+    private val dispatchers: DispatcherProvider
 ) : ViewModel() {
 
     var state: RecordAudioState by mutableStateOf(RecordAudioState())
@@ -152,7 +154,7 @@ class RecordAudioViewModel @Inject constructor(
                 infoMessage.emit(RecordAudioInfoMessageType.UnableToRecordAudioCall.uiText)
             }
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(dispatchers.default()) {
                 val assetSizeLimit = getAssetSizeLimit(false)
                 audioMediaRecorder.setUp(assetSizeLimit)
                 if (audioMediaRecorder.startRecording()) {
@@ -169,31 +171,33 @@ class RecordAudioViewModel @Inject constructor(
     }
 
     fun stopRecording() {
-        if (state.buttonState == RecordAudioButtonState.RECORDING) {
-            audioMediaRecorder.stop()
-        }
-        audioMediaRecorder.release()
+        viewModelScope.launch(dispatchers.default()) {
+            if (state.buttonState == RecordAudioButtonState.RECORDING) {
+                audioMediaRecorder.stop()
+            }
+            audioMediaRecorder.release()
 
-        if (state.originalOutputFile != null && state.effectsOutputFile != null) {
-            generateAudioFileWithEffects(
-                context = context,
-                originalFilePath = state.originalOutputFile!!.path,
-                effectsFilePath = state.effectsOutputFile!!.path
-            )
+            if (state.originalOutputFile != null && state.effectsOutputFile != null) {
+                generateAudioFileWithEffects(
+                    context = context,
+                    originalFilePath = state.originalOutputFile!!.path,
+                    effectsFilePath = state.effectsOutputFile!!.path
+                )
 
-            state = state.copy(
-                buttonState = RecordAudioButtonState.READY_TO_SEND,
-                audioState = AudioState.DEFAULT.copy(
-                    totalTimeInMs = AudioState.TotalTimeInMs.Known(
-                        getPlayableAudioFile()?.let {
-                            getAudioLengthInMs(
-                                dataPath = it.path.toPath(),
-                                mimeType = AUDIO_MIME_TYPE
-                            ).toInt()
-                        } ?: 0
+                state = state.copy(
+                    buttonState = RecordAudioButtonState.READY_TO_SEND,
+                    audioState = AudioState.DEFAULT.copy(
+                        totalTimeInMs = AudioState.TotalTimeInMs.Known(
+                            getPlayableAudioFile()?.let {
+                                getAudioLengthInMs(
+                                    dataPath = it.path.toPath(),
+                                    mimeType = AUDIO_MIME_TYPE
+                                ).toInt()
+                            } ?: 0
+                        )
                     )
                 )
-            )
+            }
         }
     }
 

diff --git a/...t/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModelTest.kt b/...t/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModelTest.kt
@@ -20,6 +20,7 @@ package com.wire.android.ui.home.messagecomposer.recordaudio
 import android.content.Context
 import app.cash.turbine.test
 import com.wire.android.config.CoroutineTestExtension
+import com.wire.android.config.TestDispatcherProvider
 import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.framework.FakeKaliumFileSystem
 import com.wire.android.media.audiomessage.AudioState
@@ -277,6 +278,7 @@ class RecordAudioViewModelTest {
         val globalDataStore = mockk<GlobalDataStore>()
         val generateAudioFileWithEffects = mockk<GenerateAudioFileWithEffectsUseCase>()
         val context = mockk<Context>()
+        val dispatchers = TestDispatcherProvider()
 
         val viewModel by lazy {
             RecordAudioViewModel(
@@ -287,7 +289,8 @@ class RecordAudioViewModelTest {
                 audioMediaRecorder = audioMediaRecorder,
                 getAssetSizeLimit = getAssetSizeLimit,
                 generateAudioFileWithEffects = generateAudioFileWithEffects,
-                globalDataStore = globalDataStore
+                globalDataStore = globalDataStore,
+                dispatchers = dispatchers
             )
         }