Unverified Commit bf75427c authored 4 years ago by Kolya Opahle Committed by GitHub 4 years ago

Merge pull request #1667 from...

Merge pull request #1667 from corona-warn-app/fix/3456-enfv2-main-branch-mergeconflicts-and-invalid-token

Fix conflicts with 1.8.x and fix token issue

parents 541651ae 49996ef8

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/deviceForTesters/java/de/rki/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt 0 additions, 163 deletions

...i/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt 1 addition, 1 deletion

.../coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 11 additions, 2 deletions

...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
Corona-Warn-App/src/main/assets/privacy_de.html 5 additions, 6 deletions

Corona-Warn-App/src/main/assets/privacy_de.html
Corona-Warn-App/src/main/assets/privacy_en.html 2 additions, 4 deletions

Corona-Warn-App/src/main/assets/privacy_en.html
Corona-Warn-App/src/main/assets/privacy_tr.html 22 additions, 23 deletions

Corona-Warn-App/src/main/assets/privacy_tr.html
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/ConfigChangeDetector.kt 1 addition, 1 deletion

...va/de/rki/coronawarnapp/appconfig/ConfigChangeDetector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt 1 addition, 5 deletions

...rnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt 5 additions, 1 deletion

...ki/coronawarnapp/exception/reporting/ExceptionReporter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFClient.kt 4 additions, 2 deletions

...pp/src/main/java/de/rki/coronawarnapp/nearby/ENFClient.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFModule.kt 6 additions, 0 deletions

...pp/src/main/java/de/rki/coronawarnapp/nearby/ENFModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt 3 additions, 1 deletion

.../de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt 0 additions, 9 deletions

...oronawarnapp/nearby/InternalExposureNotificationClient.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt 3 additions, 3 deletions

...dules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/version/DefaultENFVersion.kt 53 additions, 0 deletions

...coronawarnapp/nearby/modules/version/DefaultENFVersion.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/version/ENFVersion.kt 17 additions, 0 deletions

...de/rki/coronawarnapp/nearby/modules/version/ENFVersion.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt 28 additions, 44 deletions

...rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt 13 additions, 4 deletions

...in/java/de/rki/coronawarnapp/storage/TracingRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/common/DefaultTaskRequest.kt 2 additions, 1 deletion

...va/de/rki/coronawarnapp/task/common/DefaultTaskRequest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt 32 additions, 1 deletion

...e/rki/coronawarnapp/ui/information/InformationFragment.kt

with 209 additions and 271 deletions

Please register or to comment