Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Task/14277 Add new consent screen and os confirmation #4879

Merged
merged 28 commits into from
Nov 10, 2022
Merged

Task/14277 Add new consent screen and os confirmation #4879

merged 28 commits into from
Nov 10, 2022

Conversation

30mar
Copy link
Contributor

@30mar 30mar commented Nov 7, 2022

Description

The new consent screen is added according to Figma
    If the screen is closed without giving consent, the homescreen is shown
    note: no device check is executed at this point in time!
In a next step the keys shall be requested from the operating system, which launches the OS confirmation screen
    If the user doesn't consent to the OS screen, the screen is closed and the consent screen is shown again

Link to Jira

https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-14277

Screenshots

@30mar 30mar requested review from a team November 7, 2022 23:47
@naveeddotio naveeddotio added the task part of a feature label Nov 8, 2022
@naveeddotio naveeddotio added this to the v2.29.0 milestone Nov 8, 2022
@naveeddotio naveeddotio changed the title Feature/14277 add new consent screen and os confirmation Task/14277 add new consent screen and os confirmation Nov 8, 2022
@naveeddotio naveeddotio changed the title Task/14277 add new consent screen and os confirmation Task/14277 Add new consent screen and os confirmation Nov 9, 2022
flxschmidt
flxschmidt reviewed Nov 10, 2022
View reviewed changes
Copy link
Contributor

@flxschmidt flxschmidt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, just a few minor hints or questions.

src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift


private func makeSRSConsentScreen(srsFlowType: SRSFlowType) -> SRSConsentViewController {
return SRSConsentViewController { [weak self] isLoading in
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return not needed

src/xcode/ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionCoordinator.swift

private func makeSRSConsentScreen(srsFlowType: SRSFlowType) -> SRSConsentViewController {
return SRSConsentViewController { [weak self] isLoading in
guard let self = self else { return }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use guard let self else { return } from Swift 5.7 in the meanwhile? (Pipeline)

...A/Source/Scenes/ExposureSubmission/View/Controller/SRSConsent/SRSConsentViewController.swift Outdated

// MARK: - Private

private let viewModel = SRSConsentViewModel()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your solution is completely fine.
I would use that as the default argument from the constructor, to make it overwritable.

init(viewModel: SRSConsentViewModel = .init()) { ... }

...NA/ENA/Source/Scenes/ExposureSubmission/View/Controller/SRSConsent/SRSConsentViewModel.swift

return points
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clean code, awesome!!

30mar added 2 commits November 10, 2022 12:01
@30mar
no message
cb282bc
@30mar
Merge branch 'feature/14277-Add-new-consent-screen-and-OS-confirmatio…
a08c18e 
…n' of github.com:corona-warn-app/cwa-app-ios into feature/14277-Add-new-consent-screen-and-OS-confirmation
@naveeddotio naveeddotio merged commit 46addb9 into story/14171-support-sharing-self-test Nov 10, 2022
@naveeddotio naveeddotio deleted the feature/14277-Add-new-consent-screen-and-OS-confirmation branch November 10, 2022 15:03
@larswmh larswmh modified the milestones: v2.29.0, v3.0.0 Dec 12, 2022
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@flxschmidt flxschmidt flxschmidt approved these changes

@naveeddotio naveeddotio naveeddotio approved these changes

Assignees
No one assigned
Labels
task part of a feature
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@30mar @flxschmidt @naveeddotio @larswmh