Commit 74a20cfa authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.8.x' into fix/merge-18x-into-19x

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
#	gradle.properties

parents b0afc436 bf994f60

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/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 3 additions, 3 deletions

...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/internal/AppConfigSource.kt 1 addition, 1 deletion

...e/rki/coronawarnapp/appconfig/internal/AppConfigSource.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysSettings.kt 27 additions, 1 deletion

...p/diagnosiskeys/download/DownloadDiagnosisKeysSettings.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt 15 additions, 7 deletions

...rnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyPackageSyncTool.kt 3 additions, 3 deletions

...oronawarnapp/diagnosiskeys/download/KeyPackageSyncTool.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/BuildConfigWrap.kt 2 additions, 0 deletions

.../java/de/rki/coronawarnapp/environment/BuildConfigWrap.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/legacy/RiskLevelResultMigrator.kt 43 additions, 6 deletions

...onawarnapp/risk/storage/legacy/RiskLevelResultMigrator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardState.kt 12 additions, 5 deletions

.../de/rki/coronawarnapp/ui/tracing/card/TracingCardState.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt 3 additions, 3 deletions

...-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
Corona-Warn-App/src/main/res/values-de/strings.xml 0 additions, 2 deletions

Corona-Warn-App/src/main/res/values-de/strings.xml
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/mapping/ConfigParserTest.kt 27 additions, 0 deletions

...e/rki/coronawarnapp/appconfig/mapping/ConfigParserTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/DownloadDiagnosisKeysSettingsTest.kt 79 additions, 0 deletions

...arnapp/diagnosiskeys/DownloadDiagnosisKeysSettingsTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTaskTest.kt 166 additions, 1 deletion

...p/diagnosiskeys/download/DownloadDiagnosisKeysTaskTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyPackageSyncToolTest.kt 7 additions, 7 deletions

...awarnapp/diagnosiskeys/download/KeyPackageSyncToolTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorageTest.kt 3 additions, 3 deletions

...ki/coronawarnapp/risk/storage/BaseRiskLevelStorageTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/storage/legacy/RiskLevelResultMigratorTest.kt 11 additions, 7 deletions

...arnapp/risk/storage/legacy/RiskLevelResultMigratorTest.kt
Corona-Warn-App/src/test/resources/appconfig_1_7_1.bin 0 additions, 0 deletions

Corona-Warn-App/src/test/resources/appconfig_1_7_1.bin
Corona-Warn-App/src/test/resources/appconfig_1_8_0.bin 0 additions, 0 deletions

Corona-Warn-App/src/test/resources/appconfig_1_8_0.bin
Corona-Warn-App/src/testDevice/java/de/rki/coronawarnapp/test/risk/storage/DefaultRiskLevelStorageTest.kt 1 addition, 1 deletion

...awarnapp/test/risk/storage/DefaultRiskLevelStorageTest.kt
Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/risk/storage/DefaultRiskLevelStorageTest.kt 1 addition, 1 deletion

...awarnapp/test/risk/storage/DefaultRiskLevelStorageTest.kt

with 404 additions and 51 deletions

Please register or to comment