Commit b45ce78c authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.4.x' into release/2.5.x

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDccV1Parser.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt

parents 6c7588f5 b26d1301

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentTest.kt 196 additions, 0 deletions

...napp/covidcertificate/test/ui/CertificatesFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/test/ui/CovidCertificateDetailsFragmentTest.kt 143 additions, 0 deletions

...ertificate/test/ui/CovidCertificateDetailsFragmentTest.kt
Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt 4 additions, 0 deletions

...droidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCodeValidator.kt 8 additions, 2 deletions

...onawarnapp/coronatest/qrcode/CoronaTestQRCodeValidator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/InvalidQRCodeException.kt 3 additions, 2 deletions

...coronawarnapp/coronatest/qrcode/InvalidQRCodeException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/PcrQrCodeExtractor.kt 1 addition, 1 deletion

...rki/coronawarnapp/coronatest/qrcode/PcrQrCodeExtractor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt 1 addition, 1 deletion

...awarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/exception/InvalidHealthCertificateException.kt 4 additions, 2 deletions

...ate/common/exception/InvalidHealthCertificateException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/exception/InvalidVaccinationCertificateException.kt 26 additions, 13 deletions

...ommon/exception/InvalidVaccinationCertificateException.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragment.kt 1 addition, 1 deletion

...awarnapp/covidcertificate/test/ui/CertificatesFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt 1 addition, 1 deletion

...ficate/test/ui/details/CovidCertificateDetailsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDccV1.kt 25 additions, 1 deletion

...tificate/vaccination/core/certificate/VaccinationDccV1.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDccV1Parser.kt 39 additions, 31 deletions

...te/vaccination/core/certificate/VaccinationDccV1Parser.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt 4 additions, 4 deletions

...ate/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeValidator.kt 1 addition, 1 deletion

...ate/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainer.kt 2 additions, 1 deletion

...ccination/core/repository/storage/VaccinationContainer.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt 7 additions, 0 deletions

...cate/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt 3 additions, 0 deletions

...napp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt 16 additions, 9 deletions

.../ui/presencetracing/attendee/checkins/CheckInsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt 20 additions, 9 deletions

...ui/presencetracing/attendee/checkins/CheckInsViewModel.kt

with 505 additions and 79 deletions

Please register or to comment