Merge branch 'dev' into feature/interoperability
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
No related branches found
No related tags found
Showing
- .idea/codeStyles/Project.xml 2 additions, 2 deletions.idea/codeStyles/Project.xml
- Corona-Warn-App/build.gradle 3 additions, 2 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml 4 additions, 4 deletions...arn-App/src/deviceForTesters/res/layout/fragment_main.xml
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SettingsRepository.kt 11 additions, 8 deletions...n/java/de/rki/coronawarnapp/storage/SettingsRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/timer/TimerHelper.kt 8 additions, 3 deletions...p/src/main/java/de/rki/coronawarnapp/timer/TimerHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisInjectionHelper.kt 10 additions, 0 deletions...nawarnapp/transaction/RetrieveDiagnosisInjectionHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt 12 additions, 9 deletions...nawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelInjectionHelper.kt 10 additions, 0 deletions...rki/coronawarnapp/transaction/RiskLevelInjectionHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt 6 additions, 1 deletion.../de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/SubmitDiagnosisInjectionHelper.kt 10 additions, 0 deletions...ronawarnapp/transaction/SubmitDiagnosisInjectionHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/SubmitDiagnosisKeysTransaction.kt 7 additions, 2 deletions...ronawarnapp/transaction/SubmitDiagnosisKeysTransaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/Transaction.kt 45 additions, 43 deletions...main/java/de/rki/coronawarnapp/transaction/Transaction.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/TransactionCoroutineScope.kt 13 additions, 0 deletions...ki/coronawarnapp/transaction/TransactionCoroutineScope.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt 8 additions, 2 deletions.../coronawarnapp/ui/information/InformationAboutFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 11 additions, 4 deletions...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt 8 additions, 2 deletions.../de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsBackgroundPriorityFragment.kt 8 additions, 5 deletions...warnapp/ui/settings/SettingsBackgroundPriorityFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt 2 additions, 2 deletions...java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt 1 addition, 1 deletion...coronawarnapp/ui/settings/SettingsNotificationFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt 2 additions, 9 deletions.../rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
Loading
Please register or sign in to comment