fix: Autofill username detection #2276

4.2.4

CHANGELOG

@@ -1,3 +1,7 @@
+KeePassDX(4.3.0)
+ * Manual change of app language #1884 #1990
+ * Fix autofill username detection #2276
+
 KeePassDX(4.2.4)
  * Fix remembering database location #2262
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 19
         targetSdkVersion 35
-        versionCode = 149
-        versionName = "4.2.4"
+        versionCode = 150
+        versionName = "4.3.0"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -110,6 +110,10 @@ android {
         // Bouncy castle bug https://github.com/bcgit/bc-java/issues/1685
         resources.pickFirsts.add('META-INF/versions/9/OSGI-INF/MANIFEST.MF')
     }
+
+    androidResources {
+        generateLocaleConfig true
+    }
 }
 
 def room_version = "2.5.1"

app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/StructureParser.kt

@@ -154,7 +154,7 @@ class StructureParser(private val structure: AssistStructure) {
                 it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
                     // Password Id changed if it's the second times we are here,
                     // So the last username candidate is most appropriate
-                    if (result?.passwordId != null) {
+                    if (result?.passwordId != null && usernameIdCandidate != null) {
                         result?.usernameId = usernameIdCandidate
                         result?.usernameValue = usernameValueCandidate
                     }

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

fastlane/metadata/android/en-US/changelogs/150.txt

@@ -0,0 +1,2 @@
+ * Manual change of app language #1884 #1990
+ * Fix autofill username detection #2276

fastlane/metadata/android/fr-FR/changelogs/150.txt

@@ -0,0 +1,2 @@
+ * Changement manuel de la langue de l'appli #1884 #1990
+ * Correction de la détection du nom d'utilisateur pour le remplissage auto #2276