Merge pull request #7245 from vector-im/nimau/7235_prevent_new_voicem…

…essage_during_VB

Send voice message should not be allowed during a voice broadcast recording (#7235)

Riot/Assets/en.lproj/Vector.strings

@@ -2197,6 +2197,8 @@ Tap the + to start adding people.";
 "voice_message_remaining_recording_time" = "%@s left";
 "voice_message_stop_locked_mode_recording" = "Tap on your recording to stop or listen";
 "voice_message_lock_screen_placeholder" = "Voice message";
+"voice_message_broadcast_in_progress_title" = "Can't start voice message";
+"voice_message_broadcast_in_progress_message" = "You can't start a voice message as you are currently recording a live broadcast. Please end your live broadcast in order to start recording a voice message";
 
 // Mark: - Voice broadcast
 "voice_broadcast_unauthorized_title" = "Can't start a new voice broadcast";

Riot/Generated/Strings.swift

@@ -9207,6 +9207,14 @@ public class VectorL10n: NSObject {
   public static var voiceBroadcastUnauthorizedTitle: String { 
     return VectorL10n.tr("Vector", "voice_broadcast_unauthorized_title") 
   }
+  /// You can't start a voice message as you are currently recording a live broadcast. Please end your live broadcast in order to start recording a voice message
+  public static var voiceMessageBroadcastInProgressMessage: String { 
+    return VectorL10n.tr("Vector", "voice_message_broadcast_in_progress_message") 
+  }
+  /// Can't start voice message
+  public static var voiceMessageBroadcastInProgressTitle: String { 
+    return VectorL10n.tr("Vector", "voice_message_broadcast_in_progress_title") 
+  }
   /// Voice message
   public static var voiceMessageLockScreenPlaceholder: String { 
     return VectorL10n.tr("Vector", "voice_message_lock_screen_placeholder") 

Riot/Modules/Room/RoomViewController.m

@@ -7887,6 +7887,20 @@ - (void)voiceMessageControllerDidRequestMicrophonePermission:(VoiceMessageContro
     }];
 }
 
+- (BOOL)voiceMessageControllerDidRequestRecording:(VoiceMessageController *)voiceMessageController
+{
+    MXSession* session = self.roomDataSource.mxSession;
+    // Check whether the user is not already broadcasting here or in another room
+    if (session.voiceBroadcastService)
+    {
+        [self showAlertWithTitle:[VectorL10n voiceMessageBroadcastInProgressTitle] message:[VectorL10n voiceMessageBroadcastInProgressMessage]];
+
+        return NO;
+    }
+
+    return YES;
+}
+
 - (void)voiceMessageController:(VoiceMessageController *)voiceMessageController
     didRequestSendForFileAtURL:(NSURL *)url
                       duration:(NSUInteger)duration

Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift

@@ -20,6 +20,7 @@ import DSWaveformImage
 
 @objc public protocol VoiceMessageControllerDelegate: AnyObject {
     func voiceMessageControllerDidRequestMicrophonePermission(_ voiceMessageController: VoiceMessageController)
+    func voiceMessageControllerDidRequestRecording(_ voiceMessageController: VoiceMessageController) -> Bool
     func voiceMessageController(_ voiceMessageController: VoiceMessageController, didRequestSendForFileAtURL url: URL, duration: UInt, samples: [Float]?, completion: @escaping (Bool) -> Void)
 }
 
@@ -106,6 +107,13 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         guard let temporaryFileURL = temporaryFileURL else {
              return
         }
+
+        // Ask our delegate if we can start recording
+        let canStartRecording = delegate?.voiceMessageControllerDidRequestRecording(self) ?? true
+        guard canStartRecording else {
+            return
+        }
+
         guard AVAudioSession.sharedInstance().recordPermission == .granted else {
             delegate?.voiceMessageControllerDidRequestMicrophonePermission(self)
             return

changelog.d/7235.bugfix

@@ -0,0 +1 @@
+Voice Broadcast: Prevent sending voice message during a voice broadcast recording