From 7a4da0b6d1c82274643deb03b15eca316f48a6c2 Mon Sep 17 00:00:00 2001 From: alexandreferris Date: Fri, 5 Apr 2024 16:33:47 +0200 Subject: [PATCH] fix: merge conflicts --- .../messagecomposer/recordaudio/AudioMediaRecorder.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/AudioMediaRecorder.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/AudioMediaRecorder.kt index d91fc6aabae..5cdbfe8ddda 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/AudioMediaRecorder.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/AudioMediaRecorder.kt @@ -123,13 +123,9 @@ class AudioMediaRecorder @Inject constructor( private companion object { fun getRecordingAudioFileName(): String = -<<<<<<< HEAD - "wire-audio-${DateTimeUtil.currentInstant().audioFileDateTime()}.m4a" - fun getRecordingAudioEffectsFileName(): String = - "wire-audio-${DateTimeUtil.currentInstant().audioFileDateTime()}-filter.m4a" -======= "wire-audio-${DateTimeUtil.currentInstant().fileDateTime()}.m4a" ->>>>>>> aaeaffdf8 (fix: crash on GrapheneOS when downloading certificate (WPB-7407) (#2864)) + fun getRecordingAudioEffectsFileName(): String = + "wire-audio-${DateTimeUtil.currentInstant().fileDateTime()}-filter.m4a" const val SIZE_OF_1MB = 1024 * 1024 const val AUDIO_CHANNELS = 1 const val SAMPLING_RATE = 44100