Merge branch 'release/1.4.x' into fix/1.4.x-into-1.5.x
# Conflicts: # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt # Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml # Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
No related branches found
No related tags found
Showing
- .idea/codeStyles/Project.xml 1 addition, 1 deletion.idea/codeStyles/Project.xml
- CODEOWNERS 1 addition, 1 deletionCODEOWNERS
- Corona-Warn-App/build.gradle 2 additions, 0 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/config/detekt.yml 1 addition, 1 deletionCorona-Warn-App/config/detekt.yml
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 1 addition, 1 deletion.../device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 52 additions, 1 deletion...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 6 additions, 7 deletions...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
- Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml 27 additions, 0 deletions...c/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
- Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml 27 additions, 2 deletions...arn-App/src/deviceForTesters/res/navigation/nav_graph.xml
- Corona-Warn-App/src/main/assets/privacy_de.html 285 additions, 238 deletionsCorona-Warn-App/src/main/assets/privacy_de.html
- Corona-Warn-App/src/main/assets/privacy_en.html 229 additions, 167 deletionsCorona-Warn-App/src/main/assets/privacy_en.html
- Corona-Warn-App/src/main/assets/privacy_tr.html 299 additions, 267 deletionsCorona-Warn-App/src/main/assets/privacy_tr.html
- Corona-Warn-App/src/main/assets/terms_de.html 25 additions, 25 deletionsCorona-Warn-App/src/main/assets/terms_de.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 29 additions, 20 deletions...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFClient.kt 35 additions, 0 deletions...pp/src/main/java/de/rki/coronawarnapp/nearby/ENFClient.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFClientLocalData.kt 34 additions, 0 deletions...in/java/de/rki/coronawarnapp/nearby/ENFClientLocalData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFModule.kt 24 additions, 0 deletions...pp/src/main/java/de/rki/coronawarnapp/nearby/ENFModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt 2 additions, 35 deletions...oronawarnapp/nearby/InternalExposureNotificationClient.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt 106 additions, 0 deletions...dules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DiagnosisKeyProvider.kt 25 additions, 0 deletions...arby/modules/diagnosiskeyprovider/DiagnosisKeyProvider.kt
Loading
Please register or sign in to comment