Commit 5c561811 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.13.x' into feature/4321-ppa-main

# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/legal_strings.xml
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values/legal_strings.xml

parents 7d40940e e6ea0f1f

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt 4 additions, 1 deletion

...est/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt 4 additions, 1 deletion

...idTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 4 additions, 1 deletion

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentTest.kt 1 addition, 17 deletions

...rki/coronawarnapp/ui/onboarding/OnboardingFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt 12 additions, 3 deletions

...dTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt 4 additions, 4 deletions

.../coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt 3 additions, 3 deletions

...rnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt 4 additions, 1 deletion

...awarnapp/test/datadonation/ui/DataDonationTestFragment.kt
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml 11 additions, 5 deletions

...c/deviceForTesters/res/layout/fragment_test_appconfig.xml
Corona-Warn-App/src/main/assets/privacy_de.html 250 additions, 12 deletions

Corona-Warn-App/src/main/assets/privacy_de.html
Corona-Warn-App/src/main/assets/privacy_en.html 225 additions, 9 deletions

Corona-Warn-App/src/main/assets/privacy_en.html
Corona-Warn-App/src/main/assets/privacy_tr.html 222 additions, 8 deletions

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

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/CWAConfigMapper.kt 1 addition, 9 deletions

...de/rki/coronawarnapp/appconfig/mapping/CWAConfigMapper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/remote/AppConfigServer.kt 10 additions, 2 deletions

...coronawarnapp/appconfig/sources/remote/AppConfigServer.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/remote/RemoteAppConfigSource.kt 1 addition, 1 deletion

...warnapp/appconfig/sources/remote/RemoteAppConfigSource.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt 16 additions, 0 deletions

.../rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/storage/OTPRepository.kt 13 additions, 1 deletion

...e/rki/coronawarnapp/datadonation/storage/OTPRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/SurveyException.kt 7 additions, 1 deletion

.../rki/coronawarnapp/datadonation/survey/SurveyException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/SurveySettings.kt 25 additions, 0 deletions

...e/rki/coronawarnapp/datadonation/survey/SurveySettings.kt

with 820 additions and 80 deletions

Please register or to comment