From e0f81a25736842866ddb65f49c97527daca10590 Mon Sep 17 00:00:00 2001 From: Naveed Khalid Date: Wed, 14 Dec 2022 16:18:18 +0100 Subject: [PATCH 1/2] fixing the flow issues --- .../ExposureSubmissionCoordinator.swift | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift b/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift index 52be713ba7e..f09b3a41387 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift @@ -1034,11 +1034,7 @@ class ExposureSubmissionCoordinator: NSObject, RequiresAppDependencies { self.model.shouldShowSymptomsOnsetScreen ? self.showSymptomsOnsetScreen() : self.submitExposure(showSubmissionSuccess: true, isLoading: isLoading) case .srs: - self.model.shouldShowSymptomsOnsetScreen ? self.showSymptomsOnsetScreen() : self.submitSRSExposure( - showSubmissionSuccess: true, - viewControllerToPresentingAlert: exposureSubmissionSymptomsViewController, - isLoading: isLoading - ) + self.model.shouldShowSymptomsOnsetScreen ? self.showSymptomsOnsetScreen() : self.showSRSFlowConsentAlert(for: .confirmWarnOthers(on: exposureSubmissionSymptomsViewController), isLoading: isLoading) case .none: break } @@ -1664,7 +1660,7 @@ class ExposureSubmissionCoordinator: NSObject, RequiresAppDependencies { handler: { [weak self] _ in self?.submitSRSExposure( showSubmissionSuccess: true, - viewControllerToPresentingAlert: viewController, + presentingViewController: viewController, isLoading: isLoading ) } @@ -1897,7 +1893,7 @@ class ExposureSubmissionCoordinator: NSObject, RequiresAppDependencies { private func submitSRSExposure( showSubmissionSuccess: Bool = false, - viewControllerToPresentingAlert: UIViewController, + presentingViewController: UIViewController, isLoading: @escaping (Bool) -> Void ) { self.model.submitSRSExposure( @@ -1915,7 +1911,7 @@ class ExposureSubmissionCoordinator: NSObject, RequiresAppDependencies { if let cwaKeyTruncated = cwaKeyTruncated { let increasedVolumeOfWarningsModel = SRSFlowAlert.Consent.IncreasedWarningsVolumeModel( - presentingViewController: viewControllerToPresentingAlert, + presentingViewController: presentingViewController, cwaKeysTruncated: cwaKeyTruncated, okayHandler: nextAction ) From b3f9a46c1a24afb3ed87ba3c12ccf6a07ee4d7ef Mon Sep 17 00:00:00 2001 From: Naveed Khalid Date: Thu, 15 Dec 2022 09:41:26 +0100 Subject: [PATCH 2/2] Update src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift Co-authored-by: Felix Schmidt --- .../ExposureSubmission/ExposureSubmissionCoordinator.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift b/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift index f09b3a41387..cc84672b705 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift @@ -1034,7 +1034,12 @@ class ExposureSubmissionCoordinator: NSObject, RequiresAppDependencies { self.model.shouldShowSymptomsOnsetScreen ? self.showSymptomsOnsetScreen() : self.submitExposure(showSubmissionSuccess: true, isLoading: isLoading) case .srs: - self.model.shouldShowSymptomsOnsetScreen ? self.showSymptomsOnsetScreen() : self.showSRSFlowConsentAlert(for: .confirmWarnOthers(on: exposureSubmissionSymptomsViewController), isLoading: isLoading) + self.model.shouldShowSymptomsOnsetScreen + ? self.showSymptomsOnsetScreen() + : self.showSRSFlowConsentAlert( + for: .confirmWarnOthers(on: exposureSubmissionSymptomsViewController), + isLoading: isLoading + ) case .none: break }