Merge pull request #612 from session-foundation/dev

Release 2.14.5

Author: mpretty-cyro

Session.xcodeproj/project.pbxproj

@@ -380,6 +380,13 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
                 UIView.animate(withDuration: 0.25) {
                     let remoteVideoView: RemoteVideoView = self.floatingViewVideoSource == .remote ? self.floatingRemoteVideoView : self.fullScreenRemoteVideoView
                     remoteVideoView.alpha = isEnabled ? 1 : 0
+
+                    // Retain floating view visibility if any of the video feeds are enabled
+                    let isAnyVideoFeedEnabled: Bool = (isEnabled || self.call.isVideoEnabled)
+                    
+                    // Shows floating camera to allow user to switch to fullscreen or floating
+                    // even if the other party has not yet turned on their video feed.
+                    self.floatingViewContainer.isHidden = !isAnyVideoFeedEnabled
                 }
 
                 if self.callInfoLabelStackView.alpha < 0.5 {
@@ -464,9 +471,8 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
         setUpViewHierarchy()
         setUpProfilePictureImage()
 
-        if shouldRestartCamera { cameraManager.prepare() }
-        
         _ = call.videoCapturer // Force the lazy var to instantiate
+        
         titleLabel.text = self.call.contactName
         if self.call.hasConnected {
             callDurationLabel.isHidden = false
@@ -659,14 +665,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
             self.callInfoLabelStackView.alpha = 1
         }
 
-        Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { [weak self] _ in
-            DispatchQueue.main.async {
-                self?.dismiss(animated: true, completion: {
-                    self?.conversationVC?.becomeFirstResponder()
-                    self?.conversationVC?.showInputAccessoryView()
-                })
-            }
-        }
+        self.shouldHandleCallDismiss(delay: 2)
     }
 
     @objc private func answerCall() {
@@ -680,21 +679,14 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
         }
     }
 
-    @objc private func endCall() {
+    @objc private func endCall(presentCameraRequestDialog: Bool = false) {
         dependencies[singleton: .callManager].endCall(call) { [weak self, dependencies] error in
+            self?.shouldHandleCallDismiss(delay: 1, presentCameraRequestDialog: presentCameraRequestDialog)
+            
             if let _ = error {
                 self?.call.endSessionCall()
                 dependencies[singleton: .callManager].reportCurrentCallEnded(reason: .declinedElsewhere)
             }
-            
-            Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { [weak self] _ in
-                DispatchQueue.main.async {
-                    self?.dismiss(animated: true, completion: {
-                        self?.conversationVC?.becomeFirstResponder()
-                        self?.conversationVC?.showInputAccessoryView()
-                    })
-                }
-            }
         }
     }
 
@@ -721,43 +713,88 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
     // MARK: - Video and Audio
 
     @objc private func operateCamera() {
+        
         if (call.isVideoEnabled) {
-            floatingViewContainer.isHidden = true
+            // Hides local video feed
+            (floatingViewVideoSource == .local
+             ? floatingLocalVideoView
+             : fullScreenLocalVideoView).alpha = 0
+            
+            floatingViewContainer.isHidden = !call.isRemoteVideoEnabled
+
             cameraManager.stop()
             videoButton.themeTintColor = .textPrimary
             videoButton.themeBackgroundColor = .backgroundSecondary
             switchCameraButton.isEnabled = false
             call.isVideoEnabled = false
         }
         else {
-            guard Permissions.requestCameraPermissionIfNeeded(using: dependencies) else {
-                let confirmationModal: ConfirmationModal = ConfirmationModal(
-                    info: ConfirmationModal.Info(
-                        title: "permissionsRequired".localized(),
-                        body: .text("permissionsCameraAccessRequiredCallsIos".localized()),
-                        showCondition: .disabled,
-                        confirmTitle: "sessionSettings".localized(),
-                        onConfirm: { _ in
-                            UIApplication.shared.openSystemSettings()
-                        }
-                    )
-                )
+            
+            // Added delay of preview due to permission dialog alert dismissal on allow.
+            // It causes issue on `VideoPreviewVC` presentation animation,
+            // If camera permission is already allowed no animation delay is needed
+            let previewDelay = Permissions.camera == .undetermined ? 0.5 : 0
+            
+            Permissions.requestCameraPermissionIfNeeded(
+                useCustomDeniedAlert: true,
+                using: dependencies
+            ) { [weak self, dependencies] isAuthorized in
 
-                self.navigationController?.present(confirmationModal, animated: true, completion: nil)
-                return
+                let status = Permissions.camera
+
+                switch (isAuthorized, status) {
+                    case (false, .denied):
+                        guard let presentingViewController: UIViewController = (self?.navigationController ?? dependencies[singleton: .appContext].frontMostViewController)
+                        else { return }
+
+                        DispatchQueue.main.async {
+                            let confirmationModal: ConfirmationModal = ConfirmationModal(
+                                info: ConfirmationModal.Info(
+                                    title: "cameraAccessRequired".localized(),
+                                    body: .attributedText(
+                                        "cameraAccessDeniedMessage"
+                                            .put(key: "app_name", value: Constants.app_name)
+                                            .localizedFormatted(),
+                                        scrollMode: .never
+                                    ),
+                                    confirmTitle: "endCallToEnable".localized(),
+                                    confirmStyle: .danger,
+                                    cancelTitle: "remindMeLater".localized(),
+                                    cancelStyle: .alert_text,
+                                    onConfirm: { _ in
+                                        self?.endCall(presentCameraRequestDialog: true)
+                                    },
+                                    onCancel: { modal in
+                                        dependencies[defaults: .standard, key: .shouldRemindGrantingCameraPermissionForCalls] = true
+                                        modal.dismiss(animated: true)
+                                    }
+                                )
+                            )
+                            presentingViewController.present(confirmationModal, animated: true, completion: nil)
+                        }
+                    case (true, _):
+                        DispatchQueue.main.asyncAfter(deadline: .now() + previewDelay) { [weak self] in
+                            let previewVC = VideoPreviewVC()
+                            previewVC.delegate = self
+                            self?.present(previewVC, animated: true, completion: nil)
+                        }
+                        break
+                    default: break
+                }
             }
-            let previewVC = VideoPreviewVC()
-            previewVC.delegate = self
-            present(previewVC, animated: true, completion: nil)
         }
     }
-    
+
     func cameraDidConfirmTurningOn() {
         floatingViewContainer.isHidden = false
+        
         let localVideoView: LocalVideoView = self.floatingViewVideoSource == .local ? self.floatingLocalVideoView : self.fullScreenLocalVideoView
         localVideoView.alpha = 1
+        
+        // Camera preparation
         cameraManager.prepare()
         cameraManager.start()
+        
         videoButton.themeTintColor = .backgroundSecondary
         videoButton.themeBackgroundColor = .textPrimary
         switchCameraButton.isEnabled = true
@@ -874,13 +911,26 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
         }
     }
 
+    private func shouldHandleCallDismiss(delay: TimeInterval, presentCameraRequestDialog: Bool = false) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(Int(delay))) { [weak self, dependencies] in
+            guard self?.presentingViewController != nil else { return }
+            
+            self?.dismiss(animated: true, completion: {
+                self?.conversationVC?.becomeFirstResponder()
+                self?.conversationVC?.showInputAccessoryView()
+
+                if presentCameraRequestDialog {
+                    Permissions.showEnableCameraAccessInstructions(using: dependencies)
+                } else {
+                    Permissions.remindCameraAccessRequirement(using: dependencies)
+                }
+            })
+        }
+    }
+    
     // MARK: - AVRoutePickerViewDelegate
 
-    func routePickerViewWillBeginPresentingRoutes(_ routePickerView: AVRoutePickerView) {
-        
-    }
+    func routePickerViewWillBeginPresentingRoutes(_ routePickerView: AVRoutePickerView) {}
 
-    func routePickerViewDidEndPresentingRoutes(_ routePickerView: AVRoutePickerView) {
-        
-    }
+    func routePickerViewDidEndPresentingRoutes(_ routePickerView: AVRoutePickerView) {}
 }

Session.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -28,6 +28,7 @@ final class CallMissedTipsModal: Modal {
         result.text = "callsMissedCallFrom"
             .put(key: "name", value: caller)
             .localized()
+        result.accessibilityIdentifier = "Modal heading"
         result.themeTextColor = .textPrimary
         result.textAlignment = .center
 
@@ -44,6 +45,7 @@ final class CallMissedTipsModal: Modal {
         result.themeAttributedText = "callsYouMissedCallPermissions"
             .put(key: "name", value: caller)
             .localizedFormatted(in: result)
+        result.accessibilityIdentifier = "Modal description"
 
         return result
     }()

Session/Calls/CallVC.swift

@@ -193,7 +193,10 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Observa
                         ),
                         styling: SessionCell.StyleInfo(
                             alignment: .centerHugging,
-                            customPadding: SessionCell.Padding(bottom: Values.smallSpacing),
+                            customPadding: SessionCell.Padding(
+                                leading: 0,
+                                bottom: Values.smallSpacing
+                            ),
                             backgroundStyle: .noBackground
                         ),
                         accessibility: Accessibility(