chore(ux): update handling of camera permissions

aws-amplify · Nov 15, 2023 · fec3833 · fec3833
1 parent e3cab2c
commit fec3833
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionView.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionView.swift
@@ -177,7 +177,7 @@ public struct FaceLivenessDetectorView: View {
                     onCompletion(.success(()))
                 case .encounteredUnrecoverableError(let error):
                     let closeCode = error.webSocketCloseCode ?? .normalClosure
-                    viewModel.livenessService.closeSocket(with: closeCode)
+                    viewModel.livenessService?.closeSocket(with: closeCode)
                     isPresented = false
                     onCompletion(.failure(mapError(error)))
                 default:
@@ -210,10 +210,7 @@ public struct FaceLivenessDetectorView: View {
             for: .video,
             completionHandler: { accessGranted in
                 guard accessGranted == true else { return }
-                displayState = .displayingLiveness
-                DispatchQueue.main.async {
-                    UIScreen.main.brightness = 1.0
-                }
+                displayState = .awaitingLivenessSession
             }
         )
 

diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift
@@ -24,7 +24,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
     var closeButtonAction: () -> Void
     let videoChunker: VideoChunker
     let sessionID: String
-    var livenessService: LivenessService!
+    var livenessService: LivenessService?
     let faceDetector: FaceDetector
     let faceInOvalMatching: FaceInOvalMatching
     let challengeID: String = UUID().uuidString
@@ -90,7 +90,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
     }
 
     func registerServiceEvents() {
-        livenessService.register(onComplete: { [weak self] reason in
+        livenessService?.register(onComplete: { [weak self] reason in
             self?.stopRecording()
 
             switch reason {
@@ -106,7 +106,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
             }
         })
 
-        livenessService.register(
+        livenessService?.register(
             listener: { [weak self] _sessionConfiguration in
                 self?.sessionConfiguration = _sessionConfiguration
             },
@@ -174,7 +174,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
 
     func initializeLivenessStream() {
         do {
-            try livenessService.initializeLivenessStream(
+            try livenessService?.initializeLivenessStream(
                 withSessionID: sessionID,
                 userAgent: UserAgentValues.standard().userAgentString
             )
@@ -197,7 +197,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         )
 
         do {
-            try livenessService.send(
+            try livenessService?.send(
                 .freshness(event: freshnessEvent),
                 eventDate: { .init() }
             )
@@ -238,7 +238,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         initialClientEvent = _initialClientEvent
 
         do {
-            try livenessService.send(
+            try livenessService?.send(
                 .initialFaceDetected(event: _initialClientEvent),
                 eventDate: { .init() }
             )
@@ -270,7 +270,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         )
 
         do {
-            try livenessService.send(
+            try livenessService?.send(
                 .final(event: finalClientEvent),
                 eventDate: { .init() }
             )
@@ -296,7 +296,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         let videoEvent = VideoEvent.init(chunk: data, timestamp: timestamp)
 
         do {
-            try livenessService.send(
+            try livenessService?.send(
                 .video(event: videoEvent),
                 eventDate: { eventDate }
             )
@@ -335,7 +335,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         let videoEvent = VideoEvent.init(chunk: data, timestamp: timestamp)
 
         do {
-            try livenessService.send(
+            try livenessService?.send(
                 .video(event: videoEvent),
                 eventDate: { eventDate }
             )