Merge branch 'release/1.11.x' into feature/4559-contact-journal-screenshot
# Conflicts: # Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
No related branches found
No related tags found
Showing
- .reuse/dep5 45 additions, 0 deletions.reuse/dep5
- CONTRIBUTING.md 2 additions, 2 deletionsCONTRIBUTING.md
- Corona-Warn-App/build.gradle 1 addition, 20 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt 127 additions, 0 deletions...dTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingDetailsFragmentTest.kt 132 additions, 0 deletions...ki/coronawarnapp/ui/tracing/TracingDetailsFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/util/security/DBPasswordTest.kt 0 additions, 19 deletions...java/de/rki/coronawarnapp/util/security/DBPasswordTest.kt
- Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt 4 additions, 0 deletions...droidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
- Corona-Warn-App/src/main/assets/terms_de.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/terms_de.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/storage/KeyCacheRepository.kt 0 additions, 19 deletions...coronawarnapp/diagnosiskeys/storage/KeyCacheRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/storage/legacy/KeyCacheLegacyDao.kt 0 additions, 19 deletions...warnapp/diagnosiskeys/storage/legacy/KeyCacheLegacyDao.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/storage/legacy/KeyCacheLegacyEntity.kt 0 additions, 19 deletions...napp/diagnosiskeys/storage/legacy/KeyCacheLegacyEntity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/tracing/TracingIntervalDao.kt 0 additions, 19 deletions...e/rki/coronawarnapp/storage/tracing/TracingIntervalDao.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/tracing/TracingIntervalEntity.kt 0 additions, 19 deletions...ki/coronawarnapp/storage/tracing/TracingIntervalEntity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/tracing/TracingIntervalRepository.kt 0 additions, 19 deletions...oronawarnapp/storage/tracing/TracingIntervalRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/SingleLiveEvent.kt 3 additions, 0 deletions.../src/main/java/de/rki/coronawarnapp/ui/SingleLiveEvent.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt 0 additions, 19 deletions...-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ZipHelper.kt 0 additions, 19 deletions...-App/src/main/java/de/rki/coronawarnapp/util/ZipHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/database/CommonConverters.kt 0 additions, 19 deletions...va/de/rki/coronawarnapp/util/database/CommonConverters.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/SecurityHelper.kt 0 additions, 19 deletions...java/de/rki/coronawarnapp/util/security/SecurityHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/serialization/adapter/RuntimeTypeAdapterFactory.java 3 additions, 0 deletions...util/serialization/adapter/RuntimeTypeAdapterFactory.java
Loading
Please register or sign in to comment