Merge branch 'release/1.8.x' into fix/18x-into-19x
# Conflicts: # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/RiskLevelRepository.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt # Corona-Warn-App/src/main/res/values-bg/strings.xml # Corona-Warn-App/src/main/res/values-de/strings.xml # Corona-Warn-App/src/main/res/values-en/strings.xml # Corona-Warn-App/src/main/res/values-pl/strings.xml # Corona-Warn-App/src/main/res/values-ro/strings.xml # Corona-Warn-App/src/main/res/values-tr/strings.xml # Corona-Warn-App/src/main/res/values/strings.xml
Showing
- Corona-Warn-App/build.gradle 2 additions, 4 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/schemas/de.rki.coronawarnapp.risk.storage.internal.RiskResultDatabase/1.json 203 additions, 0 deletions...nawarnapp.risk.storage.internal.RiskResultDatabase/1.json
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/nearby/modules/exposurewindow/DefaultExposureWindowProvider.kt 0 additions, 0 deletions...y/modules/exposurewindow/DefaultExposureWindowProvider.kt
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 29 additions, 0 deletions...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
- Corona-Warn-App/src/deviceForTesters/AndroidManifest.xml 21 additions, 0 deletionsCorona-Warn-App/src/deviceForTesters/AndroidManifest.xml
- Corona-Warn-App/src/deviceForTesters/assets/exposure-windows-increased-risk-random.json 690 additions, 0 deletions...esters/assets/exposure-windows-increased-risk-random.json
- Corona-Warn-App/src/deviceForTesters/assets/exposure-windows-lowrisk-random.json 25 additions, 0 deletions...iceForTesters/assets/exposure-windows-lowrisk-random.json
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/nearby/modules/exposurewindow/DefaultExposureWindowProvider.kt 31 additions, 0 deletions...y/modules/exposurewindow/DefaultExposureWindowProvider.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/nearby/modules/exposurewindow/FakeExposureWindowProvider.kt 63 additions, 0 deletions...arby/modules/exposurewindow/FakeExposureWindowProvider.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 57 additions, 0 deletions...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 11 additions, 4 deletions...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/entities/ExposureWindowJson.kt 19 additions, 0 deletions...ronawarnapp/test/risklevel/entities/ExposureWindowJson.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/entities/ScanInstanceJson.kt 15 additions, 0 deletions...coronawarnapp/test/risklevel/entities/ScanInstanceJson.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt 68 additions, 22 deletions...app/test/risklevel/ui/TestRiskLevelCalculationFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 103 additions, 71 deletions...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
- Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_risk_level_calculation.xml 77 additions, 24 deletions...sters/res/layout/fragment_test_risk_level_calculation.xml
- Corona-Warn-App/src/deviceForTesters/res/xml/provider_paths.xml 4 additions, 0 deletions...-Warn-App/src/deviceForTesters/res/xml/provider_paths.xml
- Corona-Warn-App/src/main/AndroidManifest.xml 1 addition, 1 deletionCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/assets/default_app_config_android.bin 0 additions, 0 deletions...a-Warn-App/src/main/assets/default_app_config_android.bin
- Corona-Warn-App/src/main/assets/default_app_config_android.sha256 1 addition, 1 deletion...arn-App/src/main/assets/default_app_config_android.sha256
Loading
Please register or sign in to comment