Commit b5e38763 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.15.x' into chore/DEV-merge-1.5.x-into-2.0.x

# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	gradle.properties

parents d7306206 12f453c9

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/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 1 addition, 1 deletion

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 8 additions, 7 deletions

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/repo/ContactDiaryRepository.kt 10 additions, 2 deletions

...rnapp/contactdiary/storage/repo/ContactDiaryRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/repo/DefaultContactDiaryRepository.kt 18 additions, 8 deletions

...ontactdiary/storage/repo/DefaultContactDiaryRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt 8 additions, 4 deletions

...ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt 16 additions, 8 deletions

...ary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/day/DayDataNestedAdapter.kt 1 addition, 1 deletion

...tactdiary/ui/overview/adapter/day/DayDataNestedAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/common/Calculations.kt 3 additions, 2 deletions

...ronawarnapp/datadonation/analytics/common/Calculations.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionCollector.kt 8 additions, 0 deletions

.../modules/keysubmission/AnalyticsKeySubmissionCollector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionRepository.kt 14 additions, 12 deletions

...modules/keysubmission/AnalyticsKeySubmissionRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionStorage.kt 5 additions, 0 deletions

...cs/modules/keysubmission/AnalyticsKeySubmissionStorage.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/registeredtest/TestResultDonor.kt 48 additions, 28 deletions

...ation/analytics/modules/registeredtest/TestResultDonor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/storage/TestResultDonorSettings.kt 31 additions, 0 deletions

...datadonation/analytics/storage/TestResultDonorSettings.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/main/CWASettings.kt 7 additions, 2 deletions

...pp/src/main/java/de/rki/coronawarnapp/main/CWASettings.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt 55 additions, 2 deletions

...java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt 2 additions, 2 deletions

.../src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/preferences/EncryptedPreferencesHelper.kt 0 additions, 51 deletions

...warnapp/storage/preferences/EncryptedPreferencesHelper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/SubmissionRepository.kt 12 additions, 1 deletion

...a/de/rki/coronawarnapp/submission/SubmissionRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt 35 additions, 0 deletions

.../rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt 7 additions, 0 deletions

...in/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt

with 289 additions and 131 deletions

Please register or to comment