avoid potentiall null hints in autofill (#2488)

src/Kp2aAutofillParser/AutofillParser.cs

@@ -434,7 +434,7 @@ namespace Kp2aAutofillParser
         public static List<string> ConvertToCanonicalLowerCaseHints(string[] supportedHints)
         {
             List<string> result = new List<string>();
-            foreach (string hint in supportedHints)
+            foreach (string hint in supportedHints.Where(h => h != null))
             {
                 var canonicalHint = ToCanonicalHint(hint);
                 result.Add(canonicalHint.ToLower());
@@ -829,7 +829,7 @@ namespace Kp2aAutofillParser
             // * if there is no such autofill hint, we use IsPassword to 
 
             HashSet<string> autofillHintsOfAllFields = autofillView.InputFields.Where(f => f.AutofillHints != null)
-                .SelectMany(f => f.AutofillHints).Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet();
+                .SelectMany(f => f.AutofillHints).Where(x => x != null).Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet();
             bool hasLoginAutofillHints = autofillHintsOfAllFields.Intersect(_autofillHintsForLogin).Any();
 
             if (hasLoginAutofillHints)
@@ -839,9 +839,9 @@ namespace Kp2aAutofillParser
                     string[] viewHints = viewNode.AutofillHints;
                     if (viewHints == null)
                         continue;
-                    if (viewHints.Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any())
+                    if (viewHints.Where(h => h != null).Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any())
                     {
-                        AddFieldToHintMap(viewNode, viewHints.Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray());
+                        AddFieldToHintMap(viewNode, viewHints.Where(h => h != null).Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray());
                     }
 
                 }

src/Kp2aAutofillParserTest/AutofillTest.cs

@@ -72,13 +72,6 @@ namespace Kp2aAutofillParserTest
             RunTestFromAutofillInput(resourceName, "com.expressvpn.vpn", null);
         }
 
-        [Fact]
-        public void HandlesAutospillGracefully()
-        {
-            var resourceName = "Kp2aAutofillParserTest.autospill.json";
-            RunTestFromAutofillInput(resourceName, "com.vivaldi.browser", "m.facebook.com");
-        }
-
         private void RunTestFromAutofillInput(string resourceName, string expectedPackageName = null, string expectedWebDomain = null)
         {
             var assembly = Assembly.GetExecutingAssembly();

src/Kp2aAutofillParserTest/Kp2aAutofillParserTest.csproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="autospill.json" />
     <None Remove="chrome-android10-amazon-it.json" />
     <None Remove="com-expressvpn-vpn-android13.json" />
     <None Remove="com-ifs-banking-fiid3364-android13.json" />
@@ -55,9 +54,6 @@
     <EmbeddedResource Include="com-servicenet-mobile-no-focus.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="autospill.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
     <EmbeddedResource Include="imdb.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>

src/Kp2aAutofillParserTest/autospill.json

@@ -1,48 +0,0 @@
-{
-  "InputFields": [
-    {
-      "IdEntry": "native_username",
-      "ClassName": "android.widget.EditText",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 1,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null,
-      "ExpectedAssignedHints": ["username"]
-    },
-    {
-      "IdEntry": "native_password",
-      "ClassName": "android.widget.EditText",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 129,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null,
-      "ExpectedAssignedHints": []
-    },
-    {
-      "IdEntry": "webview_email",
-      "ClassName": "android.widget.EditText",
-      "AutofillHints": [ "email" ],
-      "IsFocused": true,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null,
-      "ExpectedAssignedHints": [ "emailAddress" ]
-    },
-    {
-      "IdEntry": "webview_password",
-      "ClassName": "android.widget.EditText",
-      "AutofillHints": [
-        "password"
-      ],
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null,
-      "ExpectedAssignedHints": [ "password" ]
-    }
-  ],
-  "PackageId": "com.vivaldi.browser",
-  "WebDomain": "m.facebook.com"
-}        

src/ZlibAndroid/ZlibAndroid.csproj

@@ -68,5 +68,8 @@
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\Strings.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>