Commit 1c265b69 authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.1.x' into release/2.2.x

# Conflicts:
#	gradle.properties

parents 06c550fb cf0f5fe6

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/ui/main/home/HomeFragmentTest.kt 4 additions, 1 deletion

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionConsentFragmentTest.kt 16 additions, 10 deletions

...onawarnapp/ui/submission/SubmissionConsentFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt 16 additions, 4 deletions

...i/submission/SubmissionTestResultAvailableFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt 10 additions, 4 deletions

...ubmission/SubmissionTestResultConsentGivenFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragmentTest.kt 2 additions, 0 deletions

...warnapp/ui/submission/SubmissionTestResultFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNegativeFragmentTest.kt 9 additions, 3 deletions

...ui/submission/SubmissionTestResultNegativeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNoConsentGivenFragmentTest.kt 9 additions, 3 deletions

...mission/SubmissionTestResultNoConsentGivenFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionYourConsentFragmentTest.kt 10 additions, 3 deletions

...arnapp/ui/submission/SubmissionYourConsentFragmentTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragmentViewModel.kt 1 addition, 1 deletion

...p/test/hometestcards/ui/HomeTestCardsFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/CoronaTestConfig.kt 2 additions, 2 deletions

...n/java/de/rki/coronawarnapp/appconfig/CoronaTestConfig.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/CoronaTestConfigMapper.kt 1 addition, 1 deletion

...coronawarnapp/appconfig/mapping/CoronaTestConfigMapper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt 71 additions, 55 deletions

...awarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/server/VerificationServer.kt 17 additions, 6 deletions

...rki/coronawarnapp/coronatest/server/VerificationServer.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/storage/CoronaTestStorage.kt 3 additions, 1 deletion

...rki/coronawarnapp/coronatest/storage/CoronaTestStorage.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTest.kt 21 additions, 21 deletions

...de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRProcessor.kt 3 additions, 3 deletions

.../de/rki/coronawarnapp/coronatest/type/pcr/PCRProcessor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACoronaTest.kt 36 additions, 21 deletions

...oronawarnapp/coronatest/type/rapidantigen/RACoronaTest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenCoronaTestExtensions.kt 5 additions, 4 deletions

...est/type/rapidantigen/RapidAntigenCoronaTestExtensions.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenProcessor.kt 6 additions, 0 deletions

...app/coronatest/type/rapidantigen/RapidAntigenProcessor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/SubmissionStateRAT.kt 2 additions, 0 deletions

...arnapp/coronatest/type/rapidantigen/SubmissionStateRAT.kt

with 244 additions and 143 deletions

Please register or to comment