Commit e51c8031 authored 4 years ago by chris-cwa

Merge remote-tracking branch 'origin/release/1.8.x' into feature/3456-enfv2-main-branch

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/AppConfigModule.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt

parents d2f89e74 fc33f8d1

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/build.gradle 5 additions, 3 deletions

Corona-Warn-App/build.gradle
Corona-Warn-App/config/detekt.yml 1 addition, 1 deletion

Corona-Warn-App/config/detekt.yml
Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.6.1-eap.aar 0 additions, 0 deletions

...s/play-services-nearby-exposurenotification-1.6.1-eap.aar
Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.7.2-eap.aar 0 additions, 0 deletions

...s/play-services-nearby-exposurenotification-1.7.2-eap.aar
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/diagnosiskeys/storage/KeyCacheDatabaseTest.kt 13 additions, 13 deletions

...ronawarnapp/diagnosiskeys/storage/KeyCacheDatabaseTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/bugreporting/processor/DefaultBugProcessor.kt 4 additions, 3 deletions

...ronawarnapp/bugreporting/processor/DefaultBugProcessor.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/DebugOptionsState.kt 0 additions, 6 deletions

...ava/de/rki/coronawarnapp/test/api/ui/DebugOptionsState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 1 addition, 82 deletions

...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt 1 addition, 1 deletion

.../coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt 0 additions, 5 deletions

...oronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt 1 addition, 10 deletions

...app/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsState.kt 5 additions, 0 deletions

...i/coronawarnapp/test/debugoptions/ui/DebugOptionsState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/CachedKeyListItem.kt 12 additions, 0 deletions

...ki/coronawarnapp/test/keydownload/ui/CachedKeyListItem.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt 79 additions, 0 deletions

...onawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentModule.kt 18 additions, 0 deletions

...napp/test/keydownload/ui/KeyDownloadTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt 80 additions, 0 deletions

...p/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyFileDownloadAdapter.kt 70 additions, 0 deletions

...ronawarnapp/test/keydownload/ui/KeyFileDownloadAdapter.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt 2 additions, 0 deletions

...i/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt 1 addition, 1 deletion

...app/test/risklevel/ui/TestRiskLevelCalculationFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/testtask/TestTask.kt 2 additions, 2 deletions

...java/de/rki/coronawarnapp/test/tasks/testtask/TestTask.kt

with 295 additions and 127 deletions

Please register or to comment