Merge branch 'release/1.7.x' into fix/merge-17x-into-18x
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTracker.kt
No related branches found
No related tags found
Showing
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt 6 additions, 4 deletions...rnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/HourPackageSyncTool.kt 4 additions, 4 deletions...ronawarnapp/diagnosiskeys/download/HourPackageSyncTool.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyPackageSyncSettings.kt 7 additions, 0 deletions...awarnapp/diagnosiskeys/download/KeyPackageSyncSettings.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt 7 additions, 0 deletions...dules/detectiontracker/DefaultExposureDetectionTracker.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTracker.kt 2 additions, 0 deletions...arby/modules/detectiontracker/ExposureDetectionTracker.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt 17 additions, 35 deletions...p/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt 10 additions, 1 deletion...-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/preferences/FlowPreference.kt 16 additions, 0 deletions...a/de/rki/coronawarnapp/util/preferences/FlowPreference.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/preferences/SharedPreferenceExtensions.kt 17 additions, 0 deletions...onawarnapp/util/preferences/SharedPreferenceExtensions.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/SecurityHelper.kt 2 additions, 1 deletion...java/de/rki/coronawarnapp/util/security/SecurityHelper.kt
- Corona-Warn-App/src/main/res/values-bg/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-bg/strings.xml
- Corona-Warn-App/src/main/res/values-de/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-de/strings.xml
- Corona-Warn-App/src/main/res/values-en/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-en/strings.xml
- Corona-Warn-App/src/main/res/values-pl/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-pl/strings.xml
- Corona-Warn-App/src/main/res/values-ro/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-ro/strings.xml
- Corona-Warn-App/src/main/res/values-tr/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values-tr/strings.xml
- Corona-Warn-App/src/main/res/values/strings.xml 0 additions, 2 deletionsCorona-Warn-App/src/main/res/values/strings.xml
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/download/HourPackageSyncToolTest.kt 14 additions, 0 deletions...warnapp/diagnosiskeys/download/HourPackageSyncToolTest.kt
- Corona-Warn-App/src/test/java/testhelpers/preferences/MockFlowPreference.kt 1 addition, 0 deletions...c/test/java/testhelpers/preferences/MockFlowPreference.kt
- Corona-Warn-App/src/test/java/testhelpers/preferences/MockSharedPreferences.kt 5 additions, 4 deletions...est/java/testhelpers/preferences/MockSharedPreferences.kt
Loading
Please register or sign in to comment