Commit 499fdae9 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.9.x' into fix/merge-1.9.x-into-1.10.x

# Conflicts:
#	gradle.properties

parents 36f4eadc 554dbe1a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragment.kt 11 additions, 1 deletion

...oronawarnapp/test/submission/ui/SubmissionTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt 30 additions, 36 deletions

...app/test/submission/ui/SubmissionTestFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt 43 additions, 38 deletions

...va/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt 92 additions, 54 deletions

...nawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingConsentDialog.kt 25 additions, 0 deletions

...a/de/rki/coronawarnapp/tracing/ui/TracingConsentDialog.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt 14 additions, 8 deletions

...rnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt 7 additions, 0 deletions

.../resultavailable/SubmissionTestResultAvailableFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt 34 additions, 27 deletions

...resultavailable/SubmissionTestResultAvailableViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt 9 additions, 1 deletion

...ms/introduction/SubmissionSymptomIntroductionViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt 8 additions, 0 deletions

.../SubmissionResultPositiveOtherWarningNoConsentFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt 27 additions, 21 deletions

...SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/settings/SettingsTracingFragment.kt 7 additions, 20 deletions

...onawarnapp/ui/tracing/settings/SettingsTracingFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/settings/SettingsTracingFragmentViewModel.kt 24 additions, 41 deletions

...p/ui/tracing/settings/SettingsTracingFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt 2 additions, 0 deletions

...n-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
Corona-Warn-App/src/main/res/values-bg/strings.xml 1 addition, 1 deletion

Corona-Warn-App/src/main/res/values-bg/strings.xml
Corona-Warn-App/src/main/res/values-en/strings.xml 1 addition, 1 deletion

Corona-Warn-App/src/main/res/values-en/strings.xml
Corona-Warn-App/src/main/res/values-pl/strings.xml 1 addition, 1 deletion

Corona-Warn-App/src/main/res/values-pl/strings.xml
Corona-Warn-App/src/main/res/values-ro/strings.xml 1 addition, 1 deletion

Corona-Warn-App/src/main/res/values-ro/strings.xml
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/TracingPermissionHelperTest.kt 185 additions, 13 deletions

...e/rki/coronawarnapp/nearby/TracingPermissionHelperTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdaterTest.kt 170 additions, 3 deletions

...rnapp/submission/data/tekhistory/TEKHistoryUpdaterTest.kt

with 692 additions and 267 deletions

Please register or to comment