Unverified Commit 5bfa008c authored 4 years ago by Matthias Urhahn Committed by GitHub 4 years ago

Merge pull request #2872 from corona-warn-app/chore/merge-2.0.x-into-2.1.x

Merge 2.0.x into 2.1.x (DEV)

parents acd5b062 3ec85144

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/schemas/de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase/2.json 204 additions, 0 deletions

...napp.presencetracing.storage.TraceLocationDatabase/2.json
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/migration/PresenceTracingDatabaseMigrationTest.kt 133 additions, 0 deletions

...tracing/migration/PresenceTracingDatabaseMigrationTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/CheckInDatabaseData.kt 2 additions, 0 deletions

...onawarnapp/presencetracing/storage/CheckInDatabaseData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt 8 additions, 5 deletions

...i/submission/SubmissionTestResultAvailableFragmentTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt 5 additions, 0 deletions

...pp/test/presencetracing/ui/PresenceTracingTestFragment.kt
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_presence_tracing.xml 10 additions, 1 deletion

...eForTesters/res/layout/fragment_test_presence_tracing.xml
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/ConfigChangeDetector.kt 11 additions, 2 deletions

...va/de/rki/coronawarnapp/appconfig/ConfigChangeDetector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckIn.kt 2 additions, 0 deletions

.../de/rki/coronawarnapp/presencetracing/checkins/CheckIn.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepository.kt 17 additions, 2 deletions

...ronawarnapp/presencetracing/checkins/CheckInRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/common/CheckInRepositoryExtension.kt 13 additions, 0 deletions

...encetracing/checkins/common/CheckInRepositoryExtension.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/PresenceTracingRiskMapper.kt 31 additions, 12 deletions

...encetracing/risk/calculation/PresenceTracingRiskMapper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt 6 additions, 1 deletion

...sencetracing/risk/execution/PresenceTracingWarningTask.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt 8 additions, 2 deletions

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

...awarnapp/presencetracing/storage/TraceLocationDatabase.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/CheckInDao.kt 3 additions, 0 deletions

...i/coronawarnapp/presencetracing/storage/dao/CheckInDao.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationCheckInEntity.kt 10 additions, 1 deletion

...sencetracing/storage/entity/TraceLocationCheckInEntity.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/migration/PresenceTracingDatabaseMigration1To2.kt 38 additions, 0 deletions

...storage/migration/PresenceTracingDatabaseMigration1To2.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt 8 additions, 0 deletions

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

...ava/de/rki/coronawarnapp/risk/storage/RiskLevelStorage.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt 5 additions, 2 deletions

...va/de/rki/coronawarnapp/submission/task/SubmissionTask.kt

with 521 additions and 31 deletions

Please register or to comment