Merge branch 'release/1.15.x' into feature/5062-event-registration-main
# Conflicts: # Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/files/FileSharing.kt # Corona-Warn-App/src/main/res/navigation/nav_graph.xml
Showing
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/storage/tracing/TracingIntervalDaoTest.kt 0 additions, 75 deletions...i/coronawarnapp/storage/tracing/TracingIntervalDaoTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt 59 additions, 0 deletions...rnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt 0 additions, 479 deletions...est/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt 2 additions, 5 deletions...idTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 185 additions, 5 deletions...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt 0 additions, 9 deletions...dTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/util/security/DBPasswordTest.kt 0 additions, 138 deletions...java/de/rki/coronawarnapp/util/security/DBPasswordTest.kt
- Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt 0 additions, 2 deletions...-App/src/androidTest/java/testhelpers/TestAppComponent.kt
- Corona-Warn-App/src/androidTest/java/testhelpers/TestExtensions.kt 31 additions, 0 deletions...rn-App/src/androidTest/java/testhelpers/TestExtensions.kt
- Corona-Warn-App/src/debug/AndroidManifest.xml 5 additions, 1 deletionCorona-Warn-App/src/debug/AndroidManifest.xml
- Corona-Warn-App/src/debug/java/de/rki/coronawarnapp/ui/main/FakeMainActivity.kt 33 additions, 0 deletions...bug/java/de/rki/coronawarnapp/ui/main/FakeMainActivity.kt
- Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml 27 additions, 0 deletionsCorona-Warn-App/src/debug/res/layout/activity_fake_main.xml
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 1 addition, 3 deletions...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt 0 additions, 8 deletions...rs/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt 0 additions, 14 deletions...e/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt 1 addition, 3 deletions...rki/coronawarnapp/risk/storage/DefaultRiskLevelStorage.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/qrcode/QrCodeCreationTestViewModel.kt 1 addition, 1 deletion...ventregistration/ui/qrcode/QrCodeCreationTestViewModel.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 0 additions, 4 deletions...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
- Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_deviceinfo.xml 0 additions, 42 deletions.../deviceForTesters/res/layout/fragment_test_deviceinfo.xml
- Corona-Warn-App/src/main/assets/privacy_de.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/privacy_de.html
Loading
Please register or sign in to comment