Unverified Commit 48d256cb authored 4 years ago by Matthias Urhahn Committed by GitHub 4 years ago

Merge pull request #1306 from corona-warn-app/fix/1.5.x-into-1.6.x

Merge 1.5.x into 1.6.x

parents 0d43121c 1a08c25e

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/build.gradle 19 additions, 13 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/src/androidTest/java/de/rki/coronawarnapp/util/security/VerificationKeysTest.kt 27 additions, 12 deletions

...e/rki/coronawarnapp/util/security/VerificationKeysTest.kt
Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 0 additions, 213 deletions

.../device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
Corona-Warn-App/src/device/res/navigation/test_nav_graph.xml 5 additions, 0 deletions

Corona-Warn-App/src/device/res/navigation/test_nav_graph.xml
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/DebugOptionsState.kt 6 additions, 0 deletions

...ava/de/rki/coronawarnapp/test/api/ui/DebugOptionsState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/EnvironmentState.kt 21 additions, 0 deletions

...java/de/rki/coronawarnapp/test/api/ui/EnvironmentState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/GoogleServicesState.kt 5 additions, 0 deletions

...a/de/rki/coronawarnapp/test/api/ui/GoogleServicesState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/LoggerState.kt 13 additions, 0 deletions

...ters/java/de/rki/coronawarnapp/test/api/ui/LoggerState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 156 additions, 226 deletions

...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt 99 additions, 8 deletions

.../coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuAdapter.kt 45 additions, 0 deletions

...java/de/rki/coronawarnapp/test/menu/ui/TestMenuAdapter.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt 41 additions, 0 deletions

...ava/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentModule.kt 16 additions, 0 deletions

.../rki/coronawarnapp/test/menu/ui/TestMenuFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt 27 additions, 0 deletions

...i/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuItem.kt 12 additions, 0 deletions

...rs/java/de/rki/coronawarnapp/test/menu/ui/TestMenuItem.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt 6 additions, 0 deletions

...app/test/risklevel/ui/TestRiskLevelCalculationFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt 5 additions, 0 deletions

...va/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
Corona-Warn-App/src/deviceForTesters/res/drawable/ic_bug.xml 10 additions, 0 deletions

Corona-Warn-App/src/deviceForTesters/res/drawable/ic_bug.xml
Corona-Warn-App/src/deviceForTesters/res/drawable/ic_coffee.xml 10 additions, 0 deletions

...-Warn-App/src/deviceForTesters/res/drawable/ic_coffee.xml

with 524 additions and 473 deletions

Please register or to comment