mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

added hint detection to username/password fields

Browse source
This commit is contained in:
Kyle Spearrin 2017-11-17 23:38:09 -05:00
parent 955fc97cb2
commit 84ea28adfa
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Android/Autofill/FieldCollection.cs
View file

@ -3,6 +3,7 @@ using Android.Service.Autofill;
using Android.Views.Autofill; using Android.Views.Autofill;
using System.Linq; using System.Linq;
using Android.Text; using Android.Text;
using Android.Views;
namespace Bit.Android.Autofill namespace Bit.Android.Autofill
{ {
@ -32,10 +33,17 @@ namespace Bit.Android.Autofill
return _passwordFields; return _passwordFields;
} }
_passwordFields = Fields.Where(f => f.InputType.HasFlag(InputTypes.TextVariationPassword)).ToList(); if(Hints.Any())
if(!_passwordFields.Any())
{ {
_passwordFields = Fields.Where(f => f.IdEntry?.ToLower().Contains("password") ?? false).ToList(); _passwordFields = Fields.Where(f => f.Hints.Contains(View.AutofillHintPassword)).ToList();
}
else
{
_passwordFields = Fields.Where(f => f.InputType.HasFlag(InputTypes.TextVariationPassword)).ToList();
if(!_passwordFields.Any())
{
_passwordFields = Fields.Where(f => f.IdEntry?.ToLower().Contains("password") ?? false).ToList();
}
} }
return _passwordFields; return _passwordFields;
@ -51,15 +59,25 @@ namespace Bit.Android.Autofill
return _usernameFields; return _usernameFields;
} }
_usernameFields = new List<Field>(); if(Hints.Any())
foreach(var passwordField in PasswordFields)
{ {
var usernameField = Fields.TakeWhile(f => f.Id != passwordField.Id).LastOrDefault(); _usernameFields = Fields
if(usernameField != null) .Where(f => f.Hints.Any(fh => fh == View.AutofillHintEmailAddress || fh == View.AutofillHintUsername))
.ToList();
}
else
{
_usernameFields = new List<Field>();
foreach(var passwordField in PasswordFields)
{ {
_usernameFields.Add(usernameField); var usernameField = Fields.TakeWhile(f => f.Id != passwordField.Id).LastOrDefault();
if(usernameField != null)
{
_usernameFields.Add(usernameField);
}
} }
} }
return _usernameFields; return _usernameFields;
} }
} }