Merge pull request #1780 from nextcloud/check-microphone-permission-i…

…n-call Disable UI when microphone permission is missing
nextcloud · Aug 24, 2024 · a9f4fe7 · a9f4fe7
2 parents 416f844 + c51c4c8
commit a9f4fe7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/NextcloudTalk/CallViewController.m b/NextcloudTalk/CallViewController.m
@@ -2043,12 +2043,20 @@ - (void)callControllerDidDrawFirstLocalFrame:(NCCallController *)callController
 
 - (void)callController:(NCCallController *)callController userPermissionsChanged:(NSInteger)permissions
 {
-    [self setAudioMuteButtonEnabled:(permissions & NCPermissionCanPublishAudio)];
+    [self setAudioMuteButtonEnabled:(permissions & NCPermissionCanPublishAudio) && [callController isMicrophoneAccessAvailable]];
     [self setVideoDisableButtonEnabled:((permissions & NCPermissionCanPublishVideo) && [callController isCameraAccessAvailable])];
 }
 
 - (void)callController:(NCCallController *)callController didCreateLocalAudioTrack:(RTCAudioTrack *)audioTrack
 {
+    if (!audioTrack) {
+        // No audio track was created, probably because there are no publishing rights or microphone access was denied
+        [self setAudioMuteButtonEnabled:NO];
+        [self setAudioMuteButtonActive:NO];
+
+        return;
+    }
+
     [self setAudioMuteButtonActive:audioTrack.isEnabled];
 }
 

diff --git a/NextcloudTalk/NCCallController.h b/NextcloudTalk/NCCallController.h
@@ -79,6 +79,7 @@ typedef void (^GetAudioEnabledStateCompletionBlock)(BOOL isEnabled);
 - (void)enableBackgroundBlur:(BOOL)enable;
 - (void)stopCapturing;
 - (BOOL)isCameraAccessAvailable;
+- (BOOL)isMicrophoneAccessAvailable;
 
 - (void)willSwitchToCall:(NSString *)token;
 

diff --git a/NextcloudTalk/NCCallController.m b/NextcloudTalk/NCCallController.m
@@ -498,6 +498,12 @@ - (BOOL)isCameraAccessAvailable {
     return (authStatus == AVAuthorizationStatusAuthorized);
 }
 
+- (BOOL)isMicrophoneAccessAvailable
+{
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
+    return (authStatus == AVAuthorizationStatusAuthorized);
+}
+
 - (void)stopCapturing
 {
     [self.cameraController stopAVCaptureSession];
@@ -864,7 +870,9 @@ - (void)createLocalMedia
         self->_localAudioTrack = nil;
         self->_localVideoTrack = nil;
 
-        if ((self->_userPermissions & NCPermissionCanPublishAudio) != 0 || !self->_serverSupportsConversationPermissions) {
+        BOOL hasPublishAudioPermission = ((self->_userPermissions & NCPermissionCanPublishAudio) != 0 || !self->_serverSupportsConversationPermissions);
+
+        if (hasPublishAudioPermission && [self isMicrophoneAccessAvailable]) {
             [self createLocalAudioTrack];
         } else {
             [self.delegate callController:self didCreateLocalAudioTrack:nil];