Commit dc667b91 authored 3 years ago by Matthias Urhahn

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

# Conflicts:
#	gradle.properties

parents b47307c1 7eab8a64

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/HomeData.kt 2 additions, 1 deletion

...idTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt 8 additions, 2 deletions

...pp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomIntroFragmentTest.kt 20 additions, 5 deletions

...rnapp/ui/submission/SubmissionSymptomIntroFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt 1 addition, 1 deletion

...ubmission/SubmissionTestResultConsentGivenFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNegativeFragmentTest.kt 1 addition, 1 deletion

...ui/submission/SubmissionTestResultNegativeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNoConsentGivenFragmentTest.kt 1 addition, 1 deletion

...mission/SubmissionTestResultNoConsentGivenFragmentTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt 6 additions, 7 deletions

...st/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragmentViewModel.kt 2 additions, 2 deletions

...p/test/hometestcards/ui/HomeTestCardsFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 6 additions, 4 deletions

...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 24 additions, 2 deletions

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt 1 addition, 3 deletions

...ntactdiary/ui/location/ContactDiaryAddLocationFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt 1 addition, 3 deletions

...p/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepositoryExtensions.kt 8 additions, 0 deletions

...oronawarnapp/coronatest/CoronaTestRepositoryExtensions.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/migration/PCRTestMigration.kt 1 addition, 0 deletions

...ki/coronawarnapp/coronatest/migration/PCRTestMigration.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/CoronaTest.kt 7 additions, 0 deletions

...n/java/de/rki/coronawarnapp/coronatest/type/CoronaTest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/ResultScheduler.kt 28 additions, 0 deletions

...i/coronawarnapp/coronatest/type/common/ResultScheduler.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestResultAvailableNotificationService.kt 13 additions, 7 deletions

...est/type/common/TestResultAvailableNotificationService.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTest.kt 6 additions, 0 deletions

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

.../de/rki/coronawarnapp/coronatest/type/pcr/PCRProcessor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt 65 additions, 0 deletions

...coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt

with 221 additions and 46 deletions

Please register or to comment