Merge branch 'dev' into feature/interoperability
# Conflicts: # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheDao.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
No related branches found
No related tags found
Showing
- .github/pull_request_template.md 37 additions, 11 deletions.github/pull_request_template.md
- CODEOWNERS 3 additions, 0 deletionsCODEOWNERS
- Corona-Warn-App/config/detekt.yml 1 addition, 1 deletionCorona-Warn-App/config/detekt.yml
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt 0 additions, 0 deletions...i/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestForAPIFragment.kt 3 additions, 1 deletion...ters/java/de/rki/coronawarnapp/test/TestForAPIFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt 4 additions, 3 deletions...ki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 2 additions, 0 deletions...Testers/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml 2 additions, 2 deletions...arn-App/src/deviceForTesters/res/navigation/nav_graph.xml
- Corona-Warn-App/src/main/assets/terms_de.html 2 additions, 2 deletionsCorona-Warn-App/src/main/assets/terms_de.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt 3 additions, 3 deletions...in/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt 9 additions, 0 deletions...oronawarnapp/nearby/InternalExposureNotificationClient.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt 1 addition, 1 deletion.../src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/submission/QRScanResult.kt 32 additions, 0 deletions...a/de/rki/coronawarnapp/service/submission/QRScanResult.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/submission/SubmissionConstants.kt 0 additions, 4 deletions...i/coronawarnapp/service/submission/SubmissionConstants.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/submission/SubmissionService.kt 2 additions, 11 deletions...rki/coronawarnapp/service/submission/SubmissionService.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt 40 additions, 0 deletions...p/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisInjectionHelper.kt 3 additions, 1 deletion...nawarnapp/transaction/RetrieveDiagnosisInjectionHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt 69 additions, 10 deletions...nawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/base/ActivityExtensions.kt 20 additions, 0 deletions...n/java/de/rki/coronawarnapp/ui/base/ActivityExtensions.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 2 additions, 1 deletion...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
Loading
Please register or sign in to comment