Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cwa App Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

4ea02130

Commit 4ea02130 authored 4 years ago by Matthias Urhahn

Downloads
- Patches
- Plain Diff

Fix merge regressions.

* Renamed variables
* Don't observe the countryList on the main thread (as it comes directly via appconfig now)

parent c1f7b5fa

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModel.kt 6 additions, 3 deletions

...i/submission/qrcode/consent/SubmissionConsentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt 2 additions, 1 deletion

...SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningViewModel.kt 0 additions, 111 deletions

...rnothers/SubmissionResultPositiveOtherWarningViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModel.kt 2 additions, 1 deletion

.../submission/yourconsent/SubmissionYourConsentViewModel.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModelTest.kt 7 additions, 2 deletions

...bmission/qrcode/consent/SubmissionConsentViewModelTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModelTest.kt 1 addition, 1 deletion

...mission/yourconsent/SubmissionYourConsentViewModelTest.kt

with 18 additions and 119 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment