From b0e722acce30d216e3a0b0ce2fe6607804336a91 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 26 Feb 2022 13:13:07 +0100
Subject: [PATCH] Best autofill recognition #1250

---
 CHANGELOG                                                 | 1 +
 .../com/kunzisoft/keepass/autofill/StructureParser.kt     | 8 +++++---
 fastlane/metadata/android/en-US/changelogs/103.txt        | 3 ++-
 fastlane/metadata/android/fr-FR/changelogs/103.txt        | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0fe45cf8c..56efc01f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ KeePassDX(3.3.1)
  * Better OOM management #256
  * Fix filters #1249
  * Fix temp advanced unlocking #1245
+ * Best autofill recognition #1250
 
 KeePassDX(3.3.0)
  * Quick search and dynamic filters #163 #462 #521
diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
index 760a09e92..d3378f90d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
@@ -377,9 +377,11 @@ class StructureParser(private val structure: AssistStructure) {
                 when {
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
-                        usernameIdCandidate = autofillId
-                        usernameValueCandidate = node.autofillValue
-                        Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
+                        if (usernameIdCandidate == null) {
+                            usernameIdCandidate = autofillId
+                            usernameValueCandidate = node.autofillValue
+                            Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
+                        }
                     }
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
diff --git a/fastlane/metadata/android/en-US/changelogs/103.txt b/fastlane/metadata/android/en-US/changelogs/103.txt
index 34e29d4d5..f1d5a8db5 100644
--- a/fastlane/metadata/android/en-US/changelogs/103.txt
+++ b/fastlane/metadata/android/en-US/changelogs/103.txt
@@ -1,4 +1,5 @@
  * Fix Japanese keyboard in search #1248
  * Better OOM management #256
  * Fix filters #1249
- * Fix temp advanced unlocking #1245
\ No newline at end of file
+ * Fix temp advanced unlocking #1245
+ * Best autofill recognition #1250
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/103.txt b/fastlane/metadata/android/fr-FR/changelogs/103.txt
index 0e4721288..ba8745a62 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/103.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/103.txt
@@ -1,4 +1,5 @@
  * Correction du clavier japonais dans la recherche #1248
  * Meilleur gestion d'OOM #256
  * Correction des filtres #1249
- * Correction du déverouillage avancé temporaire #1245
\ No newline at end of file
+ * Correction du déverouillage avancé temporaire #1245
+ * Meilleure reconnaissance du remplissage automatique #1250
\ No newline at end of file