From 0d6db1305ecd04f65c45a09cea2a856af0132314 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Tue, 21 Nov 2023 16:23:51 -0500 Subject: [PATCH] Don't check recorded voice note size if discarding. --- .../securesms/audio/AudioRecorder.java | 17 +++++++++++++++++ .../v2/VoiceMessageRecordingDelegate.kt | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java index 790176c8bf..f5f0f803aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -113,6 +113,23 @@ public class AudioRecorder { }); } + public void discardRecording() { + Log.i(TAG, "cancelRecording()"); + executor.execute(() -> { + if (recorder == null) { + Log.e(TAG, "MediaRecorder was never initialized successfully!"); + return; + } + audioFocusManager.abandonAudioFocus(); + recorder.stop(); + recordingUriFuture.cancel(true); + + recordingSubject = null; + recorder = null; + recordingUriFuture = null; + }); + } + public void stopRecording() { Log.i(TAG, "stopRecording()"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate.kt index f199253f93..9c25359be5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate.kt @@ -152,7 +152,7 @@ class VoiceMessageRecordingDelegate( fun discardRecording() { saveDraft = false shouldSend = false - audioRecorder.stopRecording() + audioRecorder.discardRecording() } fun saveDraft() {