Merge branch 'develop' into release/2.9.15

2025-12-04 15:49:33 +01:00 · 2021-03-27 10:13:53 +01:00
parent 3a12e431ff fcfb71f13b
commit ec8363ba6a
4 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@@ -2,6 +2,7 @@ KeePassDX(2.9.15)
 * Fix themes #935 #926
 * Decrease default clipboard time #934
 * Better opening performance #929 #933
+ * Fix memory usage setting #941

 KeePassDX(2.9.14)
 * Add custom icons #96
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preference/InputKdfSizePreference.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preference/InputKdfSizePreference.kt
@@ -32,7 +32,7 @@ class InputKdfSizePreference @JvmOverloads constructor(context: Context,

    override fun setSummary(summary: CharSequence) {
        if (summary == UNKNOWN_VALUE_STRING) {
-            super.setSummary("")
+            super.setSummary(summary)
        } else {
            var summaryString = summary
            try {
--- a/fastlane/metadata/android/en-US/changelogs/66.txt
+++ b/fastlane/metadata/android/en-US/changelogs/66.txt
@@ -1,3 +1,4 @@
 * Fix themes #935 #926
 * Decrease default clipboard time #934
 * Better opening performance #929 #933
+ * Fix memory usage setting #941
--- a/fastlane/metadata/android/fr-FR/changelogs/66.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/66.txt
@@ -1,3 +1,4 @@
 * Correction des themes #935 #926
 * Baisse du temps du presse-papier par defaut #934
 * Meilleures performaces d'ouverture #929 #933
+ * Correction du paramètre d'usage mémoire #941