Commit 508add63 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.14.x' into release/1.15.x

# Conflicts:
#	gradle.properties

parents 4dda7eb4 86f03265

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/main/java/de/rki/coronawarnapp/datadonation/analytics/common/Calculations.kt 17 additions, 0 deletions

...ronawarnapp/datadonation/analytics/common/Calculations.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/exposurewindows/AnalyticsExposureWindowDonor.kt 1 addition, 1 deletion

...s/modules/exposurewindows/AnalyticsExposureWindowDonor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionDonor.kt 6 additions, 4 deletions

...tics/modules/keysubmission/AnalyticsKeySubmissionDonor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionRepository.kt 3 additions, 2 deletions

...modules/keysubmission/AnalyticsKeySubmissionRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/registeredtest/TestResultDataCollector.kt 8 additions, 0 deletions

...alytics/modules/registeredtest/TestResultDataCollector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/modules/registeredtest/TestResultDonor.kt 3 additions, 2 deletions

...ation/analytics/modules/registeredtest/TestResultDonor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/tekhistory/DefaultTEKHistoryProvider.kt 7 additions, 20 deletions

...pp/nearby/modules/tekhistory/DefaultTEKHistoryProvider.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/SubmissionRepository.kt 2 additions, 1 deletion

...a/de/rki/coronawarnapp/submission/SubmissionRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt 4 additions, 2 deletions

...i/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt 5 additions, 7 deletions

...resultavailable/SubmissionTestResultAvailableViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyViewModel.kt 16 additions, 2 deletions

.../submission/resultready/SubmissionResultReadyViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt 15 additions, 2 deletions

...ms/introduction/SubmissionSymptomIntroductionViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt 1 addition, 1 deletion

...SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/exposurewindows/AnalyticsExposureWindowDonorTest.kt 24 additions, 9 deletions

...dules/exposurewindows/AnalyticsExposureWindowDonorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionCollectorTest.kt 208 additions, 1 deletion

...ules/keysubmission/AnalyticsKeySubmissionCollectorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionDonorTest.kt 100 additions, 1 deletion

.../modules/keysubmission/AnalyticsKeySubmissionDonorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/keysubmission/AnalyticsKeySubmissionRepositoryTest.kt 116 additions, 0 deletions

...les/keysubmission/AnalyticsKeySubmissionRepositoryTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/registeredtest/TestResultDataCollectorTest.kt 21 additions, 0 deletions

...ics/modules/registeredtest/TestResultDataCollectorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/tekhistory/DefaultTEKHistoryProviderTest.kt 15 additions, 4 deletions

...earby/modules/tekhistory/DefaultTEKHistoryProviderTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt 2 additions, 2 deletions

.../de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt

with 574 additions and 61 deletions

Please register or to comment