Merge branch 'release/1.8.x' into fix/merge-18x-into-19x
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningViewModel.kt # Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
No related branches found
No related tags found
Showing
- .github/ISSUE_TEMPLATE/01_bugs.md 8 additions, 7 deletions.github/ISSUE_TEMPLATE/01_bugs.md
- Corona-Warn-App/src/main/AndroidManifest.xml 1 addition, 1 deletionCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/internal/ConfigDataContainer.kt 4 additions, 2 deletions...i/coronawarnapp/appconfig/internal/ConfigDataContainer.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt 8 additions, 8 deletions...coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt 11 additions, 32 deletions...pp/storage/interoperability/InteroperabilityRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt 3 additions, 1 deletion...p/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt 0 additions, 53 deletions...src/main/java/de/rki/coronawarnapp/ui/LauncherActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt 1 addition, 1 deletion...interoperability/InteroperabilityConfigurationFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt 10 additions, 4 deletions...ability/InteroperabilityConfigurationFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivity.kt 58 additions, 0 deletions...java/de/rki/coronawarnapp/ui/launcher/LauncherActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityModule.kt 19 additions, 0 deletions...e/rki/coronawarnapp/ui/launcher/LauncherActivityModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt 31 additions, 0 deletions...ki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherEvent.kt 11 additions, 0 deletions...in/java/de/rki/coronawarnapp/ui/launcher/LauncherEvent.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt 7 additions, 4 deletions...rding/OnboardingDeltaInteroperabilityFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt 6 additions, 3 deletions...rnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningViewModel.kt 111 additions, 0 deletions...rnothers/SubmissionResultPositiveOtherWarningViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt 49 additions, 61 deletions...rc/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt 0 additions, 1 deletion...-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
- Corona-Warn-App/src/main/res/layout/include_16_years.xml 17 additions, 36 deletionsCorona-Warn-App/src/main/res/layout/include_16_years.xml
- Corona-Warn-App/src/main/res/layout/include_interoperability.xml 1 addition, 0 deletions...Warn-App/src/main/res/layout/include_interoperability.xml
Loading
Please register or sign in to comment