From fcfb71f13b9df49561a5b3536c7ba82a0a1a41d4 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 27 Mar 2021 10:12:29 +0100
Subject: [PATCH] Fix disable Memory Usage setting with AES #941

---
 CHANGELOG                                                      | 1 +
 .../keepass/settings/preference/InputKdfSizePreference.kt      | 2 +-
 fastlane/metadata/android/en-US/changelogs/66.txt              | 3 ++-
 fastlane/metadata/android/fr-FR/changelogs/66.txt              | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 619be5785..3c14daf7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 KeePassDX(2.9.15)
  * Fix themes #935
  * Decrease default clipboard time #934
+ * Fix memory usage setting #941
 
 KeePassDX(2.9.14)
  * Add custom icons #96
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preference/InputKdfSizePreference.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preference/InputKdfSizePreference.kt
index 9fe61e3a3..168efe2aa 100644
--- 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 {
diff --git a/fastlane/metadata/android/en-US/changelogs/66.txt b/fastlane/metadata/android/en-US/changelogs/66.txt
index 9b27ba3c5..ec8be643b 100644
--- a/fastlane/metadata/android/en-US/changelogs/66.txt
+++ b/fastlane/metadata/android/en-US/changelogs/66.txt
@@ -1,2 +1,3 @@
  * Fix themes #935
- * Decrease default clipboard time #934
\ No newline at end of file
+ * Decrease default clipboard time #934
+ * Fix memory usage setting #941
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/66.txt b/fastlane/metadata/android/fr-FR/changelogs/66.txt
index e76aa5dd3..053c18ed7 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/66.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/66.txt
@@ -1,2 +1,3 @@
  * Correction des themes #935
- * Baisse du temps du presse-papier par defaut #934
\ No newline at end of file
+ * Baisse du temps du presse-papier par defaut #934
+ * Correction du paramètre d'usage mémoire #941
\ No newline at end of file