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

Check-in selection in submission flow (EXPOSUREAPP-6514) #2851

Merged
merged 7 commits into from
Apr 19, 2021
Merged

Check-in selection in submission flow (EXPOSUREAPP-6514) #2851

merged 7 commits into from
Apr 19, 2021

Conversation

mtwalli
Copy link
Contributor

@mtwalli mtwalli commented Apr 16, 2021 •
edited
Loading

Important Notes

  • CheckIns screen should not be displayed if there are no completed check-ins , meaning the flow should be like as it is at the moment
  • Android back action should behave as X button and the behaviour is explained below

Case 1: User has given CWA submission consent (this is not the access TEKs ENS Consent)

  • Start at SubmissionTestResultAvailableFragment
  • Press NEXT, If TEK consent is available
    • From SubmissionTestResultAvailableFragment go to CheckInsConsentFragment
  • Press NEXT, If TEK consent is not available
    • Get TEK consent on this screen (TEKHistoryUpdater)
    • If user shared TEKS then go to CheckInsConsentFragment
    • If user didn't share TEKs, stay
  • On CheckInsConsentFragment and (SubmissionRepository.hasViewedTestResult==false)
    • If the user presses X
      • Show the same abort dialog as on SubmissionTestResultAvailableFragment
        • If the user choses "don't show test result" -> go to home screen
        • If the user choses "show test result" -> user stays on the same screen (so they can give consent) (to advance to the test result screen, the user has to either press NEXT or SKIP)
    • If the user presses NEXT
      • (because at least 1 entry is selected) we update the checkins in the database
      • We set AutoSubmission.updateMode(MONITOR)
      • We navigate to SubmissionTestResultConsentGivenFragment
    • If the user presses SKIP
      • We show a confirmation dialog
        • If user chooses "Share" we stay on the same screen
        • If the user choses don't share go to the SubmissionTestResultConsentGivenFragment
          • We set AutoSubmission.updateMode(MONITOR)

Case 2: User has not given CWA submission consent

  • Start at SubmissionResultPositiveOtherWarningNoConsentFragment
  • Press AGREE, If TEK consent is available
    • We go to CheckInsConsentFragment
  • Press AGREE, if TEK is not available
    • Get TEK consent on this screen (TEKHistoryUpdater)
    • Then go to CheckInsConsentFragment if user shared TEKs
    • If user didn't share TEKs, stay on screen
  • On CheckInsConsentFragment and (SubmissionRepository.hasViewedTestResult==true)
    • If the user presses X
      • Show same dialog as SKIP option
    • If the user presses NEXT
      • (because at least 1 entry is selected) we update the checkins database
      • We set AutoSubmission.updateMode(MONITOR)
      • We go to SubmissionResultReadyFragment
    • If we press SKIP
      • We show a confirmation dialog
        • If the user presses "DONT SHARE"
          • We set AutoSubmission.updateMode(MONITOR)
          • Go to SubmissionResultReadyFragment
        • If the user presses "SHARE" we stay on the screen

@mtwalli mtwalli requested a review from a team April 16, 2021 16:17
@mtwalli mtwalli added the maintainers Tag pull requests created by maintainers label Apr 16, 2021
@mtwalli mtwalli added this to the 2.0.0 milestone Apr 16, 2021
@mtwalli mtwalli marked this pull request as draft April 16, 2021 16:20
mtwalli and others added 2 commits April 18, 2021 23:53
@mtwalli @d4rken
CheckIns Consent (EXPOSUREAPP-6530) (#2855)
c56034c 
* Initial implementation

* Bind selectable check-ins item

* Select items

* Update strings

* lint

* show dialog

* Update strings.xml

* Delegate to ViewModel

* Correct text

* Consider pre-consent

* Move screen to actual graph

* Add unit tests

* Select All behaviour

* Tweak padding and background color in darkmode.

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
@d4rken
Add submission consent property to checkin database (EXPOSUREAPP-6514) (
efc1d86 
#2859)

* Add new Check-In property for submission consent.

* Fix unit tests.
@harambasicluka harambasicluka added prio PRs to review first. and removed prio PRs to review first. labels Apr 19, 2021
harambasicluka and others added 2 commits April 19, 2021 12:08
@harambasicluka
Merge branch 'release/2.0.x' into feature/6514-checkins-submission-se…
e696cc1 
…lection
@mtwalli @d4rken
Wire up new consent (EXPOSUREAPP-6532) (#2860)
428bdf5 
* Wire CheckIns consent

* Move to business logic

* Handle back navigation

* Fix test

* Use completedCheckIns extension

* Update CheckIns for submission

* Renaming

* Extend unit tests, test for CheckIn validity.

* Fix KLINT

* More unit tests

* Lint

* PR Comments

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
@mtwalli mtwalli marked this pull request as ready for review April 19, 2021 11:31
@mtwalli mtwalli self-assigned this Apr 19, 2021
@mtwalli mtwalli added the author merge PR to be merged by author label Apr 19, 2021
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

36.9% 36.9% Coverage
0.0% 0.0% Duplication

@harambasicluka harambasicluka self-assigned this Apr 19, 2021
@harambasicluka harambasicluka merged commit 24ba3c0 into release/2.0.x Apr 19, 2021
@harambasicluka harambasicluka deleted the feature/6514-checkins-submission-selection branch April 19, 2021 13:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@harambasicluka harambasicluka harambasicluka approved these changes

Assignees

@mtwalli mtwalli

@harambasicluka harambasicluka

Labels
author merge PR to be merged by author do not merge maintainers Tag pull requests created by maintainers
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@mtwalli @harambasicluka @d4rken