qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrap adding fields and hints to dictionary, avoiding to add a duplicate key. Should close #2262 (but I can't reproduce)

Browse Source
This commit is contained in:
Philipp Crocoll
2023-03-09 19:46:28 +01:00
parent 404e07e5c0
commit 72cc6ff768
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Kp2aAutofillParser/AutofillParser.cs
View File

@@ -838,7 +838,7 @@ namespace Kp2aAutofillParser
continue; continue;
if (viewHints.Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any()) if (viewHints.Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any())
{ {
FieldsMappedToHints.Add(viewNode, viewHints.Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray()); AddFieldToHintMap(viewNode, viewHints.Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray());
} }
} }
@@ -873,9 +873,9 @@ namespace Kp2aAutofillParser
if (passwordFields.Concat(usernameFields).Any(f => f.IsFocused)) if (passwordFields.Concat(usernameFields).Any(f => f.IsFocused))
{ {
foreach (var uf in usernameFields) foreach (var uf in usernameFields)
FieldsMappedToHints.Add(uf, new string[] { AutofillHintsHelper.AutofillHintUsername }); AddFieldToHintMap(uf, new string[] { AutofillHintsHelper.AutofillHintUsername });
foreach (var pf in passwordFields.Except(usernameFields)) foreach (var pf in passwordFields.Except(usernameFields))
FieldsMappedToHints.Add(pf, new string[] { AutofillHintsHelper.AutofillHintPassword }); AddFieldToHintMap(pf, new string[] { AutofillHintsHelper.AutofillHintPassword });
} }
} }
@@ -895,6 +895,18 @@ namespace Kp2aAutofillParser
return result; return result;
} }
private void AddFieldToHintMap(FieldT field, string[] hints)
{
if (FieldsMappedToHints.ContainsKey(field))
{
FieldsMappedToHints[field] = FieldsMappedToHints[field].Concat(hints).ToArray();
}
else
{
FieldsMappedToHints[field] = hints;
}
}
public bool LogAutofillView { get; set; } public bool LogAutofillView { get; set; }
private bool IsEditText(FieldT f) private bool IsEditText(FieldT f)