Commit bc53ccf4 authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.1.x' into release/2.2.x

# Conflicts:
#	Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
#	gradle.properties

parents 0851919f 67c07c96

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 0 additions, 3 deletions

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/device/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 4 additions, 1 deletion

...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 3 additions, 0 deletions

...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
Corona-Warn-App/src/main/assets/privacy_de.html 199 additions, 145 deletions

Corona-Warn-App/src/main/assets/privacy_de.html
Corona-Warn-App/src/main/assets/privacy_en.html 149 additions, 108 deletions

Corona-Warn-App/src/main/assets/privacy_en.html
Corona-Warn-App/src/main/assets/privacy_tr.html 165 additions, 117 deletions

Corona-Warn-App/src/main/assets/privacy_tr.html
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 3 additions, 10 deletions

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/CoronaTestConfig.kt 2 additions, 1 deletion

...n/java/de/rki/coronawarnapp/appconfig/CoronaTestConfig.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/CoronaTestConfigMapper.kt 4 additions, 1 deletion

...coronawarnapp/appconfig/mapping/CoronaTestConfigMapper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/remote/AppConfigServer.kt 9 additions, 1 deletion

...coronawarnapp/appconfig/sources/remote/AppConfigServer.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/exceptions/MappedException.kt 29 additions, 0 deletions

.../coronawarnapp/bugreporting/exceptions/MappedException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/ui/ErrorDialog.kt 61 additions, 0 deletions

.../java/de/rki/coronawarnapp/bugreporting/ui/ErrorDialog.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt 5 additions, 0 deletions

...tactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt 8 additions, 0 deletions

.../contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt 3 additions, 2 deletions

...a/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepositoryExtensions.kt 27 additions, 0 deletions

...oronawarnapp/coronatest/CoronaTestRepositoryExtensions.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/errors/CoronaTestNotFoundException.kt 5 additions, 0 deletions

...awarnapp/coronatest/errors/CoronaTestNotFoundException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/notification/ShareTestResultNotification.kt 11 additions, 4 deletions

...pp/coronatest/notification/ShareTestResultNotification.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/notification/ShareTestResultNotificationService.kt 83 additions, 27 deletions

...natest/notification/ShareTestResultNotificationService.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCode.kt 5 additions, 3 deletions

...e/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCode.kt

with 775 additions and 423 deletions

Please register or to comment