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

fix checking for InputTypes flags, fixes #303

Browse Source
This commit is contained in:
Philipp Crocoll
2018-03-26 13:40:30 +02:00
parent fd5b582c6c
commit a04c8f6214
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/keepass2android/services/AutofillBase/StructureParser.cs
View File

@@ -7,6 +7,7 @@ using Android.Text;
using Android.Util; using Android.Util;
using Android.Views; using Android.Views;
using Android.Views.Autofill; using Android.Views.Autofill;
using Android.Views.InputMethods;
using keepass2android.services.AutofillBase.model; using keepass2android.services.AutofillBase.model;
using FilledAutofillFieldCollection = keepass2android.services.AutofillBase.model.FilledAutofillFieldCollection; using FilledAutofillFieldCollection = keepass2android.services.AutofillBase.model.FilledAutofillFieldCollection;
@@ -152,16 +153,36 @@ namespace keepass2android.services.AutofillBase
|| (f.Hint?.ToLowerInvariant().Contains("password") ?? false); || (f.Hint?.ToLowerInvariant().Contains("password") ?? false);
} }
private static bool IsPassword(AssistStructure.ViewNode f) private static bool IsInputTypeClass(InputTypes inputType, InputTypes inputTypeClass)
{ {
return if (!InputTypes.MaskClass.HasFlag(inputTypeClass))
throw new Exception("invalid inputTypeClas");
return (((int)inputType) & (int)InputTypes.MaskClass) == (int) (inputTypeClass);
}
private static bool IsInputTypeVariation(InputTypes inputType, InputTypes inputTypeVariation)
{
if (!InputTypes.MaskVariation.HasFlag(inputTypeVariation))
throw new Exception("invalid inputTypeVariation");
return (((int)inputType) & (int)InputTypes.MaskVariation) == (int)(inputTypeVariation);
}
private static bool IsPassword(AssistStructure.ViewNode f)
{
InputTypes inputType = f.InputType;
return
(!f.IdEntry?.ToLowerInvariant().Contains("search") ?? true) && (!f.IdEntry?.ToLowerInvariant().Contains("search") ?? true) &&
(!f.Hint?.ToLowerInvariant().Contains("search") ?? true) && (!f.Hint?.ToLowerInvariant().Contains("search") ?? true) &&
( (
f.InputType.HasFlag(InputTypes.TextVariationPassword) || (IsInputTypeClass(inputType, InputTypes.ClassText)
f.InputType.HasFlag(InputTypes.TextVariationVisiblePassword) || &&
f.InputType.HasFlag(InputTypes.TextVariationWebPassword) || (
(f.HtmlInfo?.Attributes.Any(p => p.First.ToString() == "type" && p.Second.ToString() == "password") ?? false) IsInputTypeVariation(inputType, InputTypes.TextVariationPassword)
|| IsInputTypeVariation(inputType, InputTypes.TextVariationVisiblePassword)
|| IsInputTypeVariation(inputType, InputTypes.TextVariationWebPassword)
)
)
|| (f.HtmlInfo?.Attributes.Any(p => p.First.ToString() == "type" && p.Second.ToString() == "password") ?? false)
); );
} }