Merge branch 'release/2.1.x' into release/2.2.x
# Conflicts: # gradle.properties
Showing
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionConsentFragmentTest.kt 7 additions, 2 deletions...onawarnapp/ui/submission/SubmissionConsentFragmentTest.kt
- Corona-Warn-App/src/main/AndroidManifest.xml 8 additions, 1 deletionCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/PresenceTracingConfigMapper.kt 3 additions, 4 deletions...awarnapp/appconfig/mapping/PresenceTracingConfigMapper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCode.kt 2 additions, 2 deletions...e/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCode.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/CoronaTestQRCodeValidator.kt 9 additions, 7 deletions...onawarnapp/coronatest/qrcode/CoronaTestQRCodeValidator.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 61 additions, 47 deletions...awarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/CoronaTest.kt 2 additions, 0 deletions...n/java/de/rki/coronawarnapp/coronatest/type/CoronaTest.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTest.kt 7 additions, 0 deletions...de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTest.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACoronaTest.kt 7 additions, 0 deletions...oronawarnapp/coronatest/type/rapidantigen/RACoronaTest.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/SubmissionRepository.kt 1 addition, 1 deletion...a/de/rki/coronawarnapp/submission/SubmissionRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 10 additions, 3 deletions...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt 3 additions, 1 deletion.../ui/presencetracing/attendee/checkins/CheckInsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/common/CompletedCheckIn.kt 15 additions, 4 deletions...sencetracing/attendee/checkins/common/CompletedCheckIn.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/ActiveCheckInVH.kt 5 additions, 3 deletions...resencetracing/attendee/checkins/items/ActiveCheckInVH.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt 1 addition, 1 deletion...resencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt 1 addition, 1 deletion.../presencetracing/organizer/list/TraceLocationsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationVH.kt 9 additions, 5 deletions...i/presencetracing/organizer/list/items/TraceLocationVH.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ScanStatus.kt 0 additions, 5 deletions...ain/java/de/rki/coronawarnapp/ui/submission/ScanStatus.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt 20 additions, 9 deletions...sion/deletionwarning/SubmissionDeletionWarningFragment.kt
Loading
Please register or sign in to comment