Remove

The logic in #2331 is unfortunately not very reliable as it'll only detect fields that have one of "email", "phone" or "username" in their id as username fields.
This commit ensures that additonally fields that have TextVariationWebEmailAddress are also detected as username fields.

src/Android/Autofill/FieldCollection.cs

@@ -102,7 +102,7 @@ namespace Bit.Droid.Autofill
 
                     if (!_usernameFields.Any())
                     {
-                        _usernameFields = Fields.Where(f => FieldHasUsernameTerms(f)).ToList();
+                        _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
                     }
                 }
                 return _usernameFields;
@@ -327,13 +327,18 @@ namespace Bit.Droid.Autofill
             }
 
             return inputTypePassword && !ValueContainsAnyTerms(f.IdEntry, _ignoreSearchTerms) &&
-                !ValueContainsAnyTerms(f.Hint, _ignoreSearchTerms) && !FieldHasUsernameTerms(f);
+                !ValueContainsAnyTerms(f.Hint, _ignoreSearchTerms) && !FieldIsUsername(f);
         }
 
         private bool FieldHasPasswordTerms(Field f)
         {
             return ValueContainsAnyTerms(f.IdEntry, _passwordTerms) || ValueContainsAnyTerms(f.Hint, _passwordTerms);
         }
+        
+        private bool FieldIsUsername(Field f)
+        {
+            return f.InputType.HasFlag(InputTypes.TextVariationWebEmailAddress) || FieldHasUsernameTerms(f);
+        }
 
         private bool FieldHasUsernameTerms(Field f)
         {
@@ -350,4 +355,4 @@ namespace Bit.Droid.Autofill
             return terms.Any(t => lowerValue.Contains(t));
         }
     }
-}
+}