Commit 0b19caab authored 4 years ago by Matthias Urhahn

Merge branch 'release/2.0.x' into dev/merge-1.15-into-2.0

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt

parents f138f228 2c5ea8ec

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 1 addition, 2 deletions

Corona-Warn-App/build.gradle
Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json 180 additions, 0 deletions

...pp.eventregistration.storage.TraceLocationDatabase/1.json
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/DefaultQRCodeVerifierTest.kt 111 additions, 0 deletions

...registration/checkins/qrcode/DefaultQRCodeVerifierTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt 40 additions, 0 deletions

...awarnapp/eventregistration/storage/CheckInDatabaseData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt 85 additions, 0 deletions

.../eventregistration/storage/TraceLocationCheckInDaoTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt 72 additions, 0 deletions

...warnapp/eventregistration/storage/TraceLocationDaoTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt 32 additions, 0 deletions

...pp/eventregistration/storage/TraceLocationDatabaseData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkin/VerifiedTraceLocationKtTest.kt 44 additions, 0 deletions

...istration/attendee/checkin/VerifiedTraceLocationKtTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityTest.kt 98 additions, 0 deletions

.../de/rki/coronawarnapp/ui/launcher/LauncherActivityTest.kt
Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt 2 additions, 0 deletions

...-App/src/androidTest/java/testhelpers/TestAppComponent.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt 61 additions, 0 deletions

...est/eventregistration/ui/EventRegistrationTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentModule.kt 18 additions, 0 deletions

...entregistration/ui/EventRegistrationTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt 15 additions, 0 deletions

...registration/ui/EventRegistrationTestFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/PrintingAdapter.kt 75 additions, 0 deletions

...oronawarnapp/test/eventregistration/ui/PrintingAdapter.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt 88 additions, 0 deletions

...entregistration/ui/createevent/CreateEventTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragmentModule.kt 19 additions, 0 deletions

...istration/ui/createevent/CreateEventTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt 75 additions, 0 deletions

...ntregistration/ui/createevent/CreateEventTestViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/qrcode/QrCodeCreationTestFragment.kt 84 additions, 0 deletions

...eventregistration/ui/qrcode/QrCodeCreationTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/qrcode/QrCodeCreationTestFragmentModule.kt 18 additions, 0 deletions

...egistration/ui/qrcode/QrCodeCreationTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/qrcode/QrCodeCreationTestViewModel.kt 124 additions, 0 deletions

...ventregistration/ui/qrcode/QrCodeCreationTestViewModel.kt

with 1242 additions and 2 deletions

Please register or to comment