Merge branch 'dev' into fix/staging_dev_conflicts
# Conflicts: # Corona-Warn-App/build.gradle # Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml # Corona-Warn-App/src/main/res/values-en/strings.xml # Corona-Warn-App/src/main/res/values-tr/strings.xml
No related branches found
No related tags found
Showing
- Corona-Warn-App/build.gradle 6 additions, 9 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml 3 additions, 3 deletions...arn-App/src/deviceForTesters/res/layout/fragment_main.xml
- Corona-Warn-App/src/main/AndroidManifest.xml 1 addition, 0 deletionsCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/assets/technical_de.html 0 additions, 8 deletionsCorona-Warn-App/src/main/assets/technical_de.html
- Corona-Warn-App/src/main/assets/technical_en.html 0 additions, 8 deletionsCorona-Warn-App/src/main/assets/technical_en.html
- Corona-Warn-App/src/main/assets/technical_tr.html 0 additions, 8 deletionsCorona-Warn-App/src/main/assets/technical_tr.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 0 additions, 10 deletions...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt 6 additions, 0 deletions...ki/coronawarnapp/exception/reporting/ExceptionReporter.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ReportingConstants.kt 2 additions, 0 deletions...i/coronawarnapp/exception/reporting/ReportingConstants.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt 10 additions, 1 deletion...-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelConstants.kt 1 addition, 0 deletions...main/java/de/rki/coronawarnapp/risk/RiskLevelConstants.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt 1 addition, 1 deletion...plicationconfiguration/ApplicationConfigurationService.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SettingsRepository.kt 10 additions, 0 deletions...n/java/de/rki/coronawarnapp/storage/SettingsRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt 11 additions, 2 deletions.../de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 15 additions, 0 deletions...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragment.kt 37 additions, 1 deletion...awarnapp/ui/onboarding/OnboardingNotificationsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt 5 additions, 1 deletion.../rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt 16 additions, 5 deletions...ubmission/SubmissionResultPositiveOtherWarningFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt 1 addition, 0 deletions...ronawarnapp/ui/submission/SubmissionTestResultFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SettingsViewModel.kt 11 additions, 0 deletions...va/de/rki/coronawarnapp/ui/viewmodel/SettingsViewModel.kt
Loading
Please register or sign in to comment