From d2c74b03ccbfd44d1422564a47fadbd47100ecd5 Mon Sep 17 00:00:00 2001
From: Igor Solomennikov <igor@signal.org>
Date: Thu, 3 Mar 2022 11:31:30 -0800
Subject: [PATCH] Address PR comments.

---
 Signal/src/ViewControllers/Photos/PhotoCapture.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Signal/src/ViewControllers/Photos/PhotoCapture.swift b/Signal/src/ViewControllers/Photos/PhotoCapture.swift
index 8d4ea32e52..baf70c2556 100644
--- a/Signal/src/ViewControllers/Photos/PhotoCapture.swift
+++ b/Signal/src/ViewControllers/Photos/PhotoCapture.swift
@@ -480,7 +480,7 @@ class PhotoCapture: NSObject {
             cameraMap[.ultraWide] = rearCameraZoomFactorMultiplier
         }
         if avTypes.contains(.builtInTelephotoCamera), let lastZoomFactor = zoomFactors.last {
-            cameraMap[.telephoto] = rearCameraZoomFactorMultiplier * CGFloat(lastZoomFactor.floatValue)
+            cameraMap[.telephoto] = rearCameraZoomFactorMultiplier * lastZoomFactor
         }
         if !Platform.isSimulator {
             owsAssertDebug(avTypes.contains(.builtInWideAngleCamera))
@@ -970,7 +970,7 @@ protocol CaptureOutputDelegate: AnyObject {
 
 protocol ImageCaptureOutput: AnyObject {
     var availableRearDeviceTypes: [AVCaptureDevice.DeviceType] { get }
-    var rearCameraSwitchOverZoomFactors: [NSNumber] { get }
+    var rearCameraSwitchOverZoomFactors: [CGFloat] { get }
     var avOutput: AVCaptureOutput { get }
     var flashMode: AVCaptureDevice.FlashMode { get set }
     func videoDevice(for deviceType: AVCaptureDevice.DeviceType, position: AVCaptureDevice.Position) -> AVCaptureDevice?
@@ -1316,10 +1316,10 @@ class PhotoCaptureOutputAdaptee: NSObject, ImageCaptureOutput {
     }()
 
     var availableRearDeviceTypes: [AVCaptureDevice.DeviceType] {
-        return availableRearDeviceMap.keys.compactMap { $0 }
+        return availableRearDeviceMap.keys.map { $0 }
     }
 
-    lazy var rearCameraSwitchOverZoomFactors: [NSNumber] = {
+    lazy var rearCameraSwitchOverZoomFactors: [CGFloat] = {
         let deviceMap = availableRearDeviceMap
 
         guard #available(iOS 13, *) else {
@@ -1331,7 +1331,7 @@ class PhotoCaptureOutputAdaptee: NSObject, ImageCaptureOutput {
         }
 
         if let multiCameraDevice = deviceMap[.builtInTripleCamera] ?? deviceMap[.builtInDualCamera] {
-            return multiCameraDevice.virtualDeviceSwitchOverVideoZoomFactors
+            return multiCameraDevice.virtualDeviceSwitchOverVideoZoomFactors.map { CGFloat(truncating: $0) }
         }
         return []
     }()