Commit 47b39680 authored 3 years ago by Matthias Urhahn

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

# Conflicts:
#	gradle.properties

parents 38f69359 886184d5

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.reuse/dep5 4 additions, 0 deletions

.reuse/dep5
Corona-Warn-App/src/device/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 9 additions, 2 deletions

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

...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt 2 additions, 2 deletions

...p/test/presencetracing/ui/PresenceTracingTestViewModel.kt
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_qr_code_poster.xml 1 addition, 0 deletions

...iceForTesters/res/layout/fragment_test_qr_code_poster.xml
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifier.kt 76 additions, 0 deletions

...ventregistration/checkins/qrcode/TraceLocationVerifier.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreator.kt 22 additions, 13 deletions

...ng/checkins/checkout/ContactJournalCheckInEntryCreator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/PtRiskLevelResult.kt 21 additions, 22 deletions

...i/coronawarnapp/presencetracing/risk/PtRiskLevelResult.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/PresenceTracingRiskCalculator.kt 11 additions, 10 deletions

...tracing/risk/calculation/PresenceTracingRiskCalculator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt 20 additions, 45 deletions

...encetracing/risk/storage/PresenceTracingRiskRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/CombinedEwPtRisk.kt 12 additions, 3 deletions

...c/main/java/de/rki/coronawarnapp/risk/CombinedEwPtRisk.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt 10 additions, 117 deletions

...de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/internal/RiskCombinator.kt 117 additions, 0 deletions

...rki/coronawarnapp/risk/storage/internal/RiskCombinator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt 13 additions, 23 deletions

...in/java/de/rki/coronawarnapp/storage/TracingRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt 1 addition, 6 deletions

...ain/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingStateProvider.kt 12 additions, 8 deletions

.../rki/coronawarnapp/tracing/states/TracingStateProvider.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragmentViewModel.kt 1 addition, 1 deletion

...app/tracing/ui/details/TracingDetailsFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInEvent.kt 5 additions, 0 deletions

...pp/ui/eventregistration/attendee/checkins/CheckInEvent.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsFragment.kt 21 additions, 4 deletions

...i/eventregistration/attendee/checkins/CheckInsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt 17 additions, 5 deletions

.../eventregistration/attendee/checkins/CheckInsViewModel.kt

with 384 additions and 263 deletions

Please register or to comment