Commit b5e38763 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.15.x' into chore/DEV-merge-1.5.x-into-2.0.x

# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	gradle.properties

parents d7306206 12f453c9

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt 2 additions, 0 deletions

...a/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt 9 additions, 1 deletion

...e/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt 1 addition, 0 deletions

...n-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/debug/UncaughtExceptionLogger.kt 12 additions, 2 deletions

...e/rki/coronawarnapp/util/debug/UncaughtExceptionLogger.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/AppInjector.kt 5 additions, 3 deletions

...src/main/java/de/rki/coronawarnapp/util/di/AppInjector.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt 5 additions, 2 deletions

...java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/encryptionmigration/EncryptedPreferencesFactory.kt 1 addition, 1 deletion

...p/util/encryptionmigration/EncryptedPreferencesFactory.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/encryptionmigration/EncryptedPreferencesHelper.kt 53 additions, 0 deletions

...pp/util/encryptionmigration/EncryptedPreferencesHelper.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/encryptionmigration/EncryptedPreferencesMigration.kt 85 additions, 38 deletions

...util/encryptionmigration/EncryptedPreferencesMigration.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/encryptionmigration/EncryptionErrorResetTool.kt 4 additions, 4 deletions

...napp/util/encryptionmigration/EncryptionErrorResetTool.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/SecurityConstants.kt 0 additions, 1 deletion

...a/de/rki/coronawarnapp/util/security/SecurityConstants.kt
Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml 0 additions, 1 deletion

...in/res/layout/contact_diary_overview_nested_list_item.xml
Corona-Warn-App/src/main/res/values-bg/contact_diary_strings.xml 3 additions, 1 deletion

...Warn-App/src/main/res/values-bg/contact_diary_strings.xml
Corona-Warn-App/src/main/res/values-bg/release_info_strings.xml 0 additions, 4 deletions

...-Warn-App/src/main/res/values-bg/release_info_strings.xml
Corona-Warn-App/src/main/res/values-bg/strings.xml 23 additions, 7 deletions

Corona-Warn-App/src/main/res/values-bg/strings.xml
Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml 3 additions, 1 deletion

...Warn-App/src/main/res/values-de/contact_diary_strings.xml
Corona-Warn-App/src/main/res/values-de/release_info_strings.xml 3 additions, 3 deletions

...-Warn-App/src/main/res/values-de/release_info_strings.xml
Corona-Warn-App/src/main/res/values-de/strings.xml 8 additions, 5 deletions

Corona-Warn-App/src/main/res/values-de/strings.xml
Corona-Warn-App/src/main/res/values-en/contact_diary_strings.xml 3 additions, 1 deletion

...Warn-App/src/main/res/values-en/contact_diary_strings.xml
Corona-Warn-App/src/main/res/values-en/release_info_strings.xml 0 additions, 4 deletions

...-Warn-App/src/main/res/values-en/release_info_strings.xml

with 220 additions and 79 deletions

Please register or to comment