Commit 56f989e9 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.5.x' into fix/pull_14X_into_15X

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt

parents 7e9840fe 0d43121c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/proguard-rules.pro 1 addition, 4 deletions

Corona-Warn-App/proguard-rules.pro
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 4 additions, 4 deletions

...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 67 additions, 142 deletions

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/AppConfigProvider.kt 16 additions, 17 deletions

.../java/de/rki/coronawarnapp/appconfig/AppConfigProvider.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/ApplicationConfigurationExtensions.kt 11 additions, 0 deletions

...nawarnapp/appconfig/ApplicationConfigurationExtensions.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/EnvironmentSetup.kt 4 additions, 3 deletions

...java/de/rki/coronawarnapp/environment/EnvironmentSetup.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/HttpModule.kt 39 additions, 1 deletion

...App/src/main/java/de/rki/coronawarnapp/http/HttpModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/RestrictedConnectionSpecs.kt 8 additions, 0 deletions

...va/de/rki/coronawarnapp/http/RestrictedConnectionSpecs.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/ServiceFactory.kt 0 additions, 101 deletions

...src/main/java/de/rki/coronawarnapp/http/ServiceFactory.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt 0 additions, 179 deletions

.../main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/requests/RegistrationRequest.kt 0 additions, 10 deletions

...de/rki/coronawarnapp/http/requests/RegistrationRequest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/requests/RegistrationTokenRequest.kt 0 additions, 12 deletions

...i/coronawarnapp/http/requests/RegistrationTokenRequest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/requests/TanRequestBody.kt 0 additions, 10 deletions

...java/de/rki/coronawarnapp/http/requests/TanRequestBody.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/responses/RegistrationTokenResponse.kt 0 additions, 8 deletions

...coronawarnapp/http/responses/RegistrationTokenResponse.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/responses/TanResponse.kt 0 additions, 8 deletions

...n/java/de/rki/coronawarnapp/http/responses/TanResponse.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/responses/TestResultResponse.kt 0 additions, 8 deletions

...de/rki/coronawarnapp/http/responses/TestResultResponse.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/playbook/BackgroundNoise.kt 7 additions, 6 deletions

...ain/java/de/rki/coronawarnapp/playbook/BackgroundNoise.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/playbook/DefaultPlaybook.kt 50 additions, 33 deletions

...ain/java/de/rki/coronawarnapp/playbook/DefaultPlaybook.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/playbook/Playbook.kt 12 additions, 10 deletions

...p/src/main/java/de/rki/coronawarnapp/playbook/Playbook.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/playbook/PlaybookModule.kt 13 additions, 0 deletions

...main/java/de/rki/coronawarnapp/playbook/PlaybookModule.kt

with 232 additions and 556 deletions

Please register or to comment