Fixes #4970 - Fixed unintentional voice message drafts on automatical…

…ly cancelled recordings.
element-hq · Oct 8, 2021 · 031b892 · 031b892
1 parent 093b10b
commit 031b892
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift
@@ -130,12 +130,7 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
     }
 
     func voiceMessageToolbarViewDidRequestRecordingCancel(_ toolbarView: VoiceMessageToolbarView) {
-        isInLockedMode = false
-        audioPlayer?.stop()
-        audioRecorder?.stopRecording()
-        deleteRecordingAtURL(temporaryFileURL)
-        UINotificationFeedbackGenerator().notificationOccurred(.error)
-        updateUI()
+        cancelRecording()
     }
 
     func voiceMessageToolbarViewDidRequestLockedModeRecording(_ toolbarView: VoiceMessageToolbarView) {
@@ -259,6 +254,8 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         guard isInLockedMode else {
             if recordDuration ?? 0 >= Constants.minimumRecordingDuration {
                 sendRecordingAtURL(temporaryFileURL)
+            } else {
+                cancelRecording()
             }
             return
         }
@@ -268,6 +265,19 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         updateUI()
     }
 
+    private func cancelRecording() {
+        isInLockedMode = false
+
+        audioPlayer?.stop()
+        audioRecorder?.stopRecording()
+
+        deleteRecordingAtURL(temporaryFileURL)
+
+        UINotificationFeedbackGenerator().notificationOccurred(.error)
+
+        updateUI()
+    }
+
     private func loadDraftRecording() {
         guard let temporaryFileURL = temporaryFileURL,
               let roomId = roomId else {

diff --git a/changelog.d/4970.bugfix b/changelog.d/4970.bugfix
@@ -0,0 +1 @@
+Fixed unintentional voice message drafts on automatically cancelled recordings (under 1 second)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed unintentional voice message drafts on automatically cancelled recordings (under 1 second)