make settings field for TrayTotp style otp entries optional

closes https://github.com/PhilippC/keepass2android/issues/2458

src/Kp2aAutofillParserTest/AutofillTest.cs

@@ -71,12 +71,6 @@ namespace Kp2aAutofillParserTest
             var resourceName = "Kp2aAutofillParserTest.com-expressvpn-vpn-android13.json";
             RunTestFromAutofillInput(resourceName, "com.expressvpn.vpn", null);
         }
-        [Fact]
-        public void TestIgnoresAndroidSettings()
-        {
-            var resourceName = "Kp2aAutofillParserTest.android14-settings.json";
-            RunTestFromAutofillInput(resourceName, "com.android.settings", null);
-        }
 
         private void RunTestFromAutofillInput(string resourceName, string expectedPackageName = null, string expectedWebDomain = null)
         {

src/Kp2aAutofillParserTest/Kp2aAutofillParserTest.csproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="android14-settings.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="android14-settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
     <EmbeddedResource Include="imdb.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>

src/Kp2aAutofillParserTest/android14-settings.json

@@ -1,99 +0,0 @@
-{
-  "InputFields": [
-    {
-      "IdEntry": null,
-      "Hint": null,
-      "ClassName": "android.widget.FrameLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "content_parent",
-      "Hint": null,
-      "ClassName": "android.widget.LinearLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "content_frame",
-      "Hint": null,
-      "ClassName": "android.widget.FrameLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "main_content",
-      "Hint": null,
-      "ClassName": "android.widget.FrameLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "password_entry",
-      "Hint": null,
-      "ClassName": "android.widget.EditText",
-      "AutofillHints": [
-        "passwordAuto"
-      ],
-      "IsFocused": true,
-      "InputType": 18,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null,
-      "ExpectedAssignedHints": [ "password" ]
-    },
-    {
-      "IdEntry": "checkbox",
-      "Hint": null,
-      "ClassName": "android.widget.CheckBox",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "button_bar",
-      "Hint": null,
-      "ClassName": "android.widget.RelativeLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "switch_bar",
-      "Hint": null,
-      "ClassName": "android.widget.LinearLayout",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    },
-    {
-      "IdEntry": "action_bar",
-      "Hint": null,
-      "ClassName": "android.view.ViewGroup",
-      "AutofillHints": null,
-      "IsFocused": false,
-      "InputType": 0,
-      "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
-    }
-  ],
-  "PackageId": "com.android.settings",
-  "WebDomain": null
-}

src/keepass2android/Totp/TrayTotpPluginAdapter.cs

@@ -31,17 +31,8 @@ namespace PluginTOTP
 				_muteWarnings = muteWarnings;
 			}
 
-			/// <summary>
-			/// Check if specified Entry contains Settings that are not null.
-			/// </summary>
-			internal bool SettingsCheck(IDictionary<string, string> entryFields)
-			{
-				string settings;
-				entryFields.TryGetValue(SettingsFieldName, out settings);
-				return !String.IsNullOrEmpty(settings);
-			}
-
-			internal bool SeedCheck(IDictionary<string, string> entryFields)
+			
+			internal bool HasSeed(IDictionary<string, string> entryFields)
 			{
 				string seed;
 				entryFields.TryGetValue(SeedFieldName, out seed);
@@ -100,15 +91,15 @@ namespace PluginTOTP
 			}
 
 			private string[] SettingsGet(IDictionary<string, string> entryFields)
-			{
-				return entryFields[SettingsFieldName].Split(';');
-			}
+            {
+                return entryFields.TryGetValue(SettingsFieldName, out var settings) ? settings.Split(';') : new[] { "30", "6" };
+            }
 
 			public TotpData GetTotpData(IDictionary<string, string> entryFields)
 			{
 				TotpData res = new TotpData();
 
-				if (SettingsCheck(entryFields) && SeedCheck(entryFields))
+				if (HasSeed(entryFields))
 				{
 					bool ValidInterval; bool ValidLength; bool ValidUrl;
 					if (SettingsValidate(entryFields, out ValidInterval, out ValidLength, out ValidUrl))

src/keepass2android/services/AutofillBase/AutofillServiceBase.cs

@@ -40,26 +40,6 @@ namespace keepass2android.services.AutofillBase
 
     public abstract class AutofillServiceBase: AutofillService
     {
-        private HashSet<string> _internal_blacklistedUris = null;
-
-        public HashSet<string> BlacklistedUris
-        {
-            get
-            {
-                if (_internal_blacklistedUris == null)
-                {
-                    _internal_blacklistedUris = new HashSet<string>()
-                    {
-                        KeePass.AndroidAppScheme + "android",
-                        KeePass.AndroidAppScheme + "com.android.settings",
-                        KeePass.AndroidAppScheme + this.PackageName
-                    };
-                }
-
-                return _internal_blacklistedUris;
-
-            }
-        }
         protected override void AttachBaseContext(Context baseContext)
         {
             base.AttachBaseContext(LocaleManager.setLocale(baseContext));
@@ -406,7 +386,7 @@ namespace keepass2android.services.AutofillBase
 
         private bool CanAutofill(StructureParser.AutofillTargetId query, bool isManual)
         {
-            if (BlacklistedUris.Contains(query.PackageNameWithPseudoSchema))
+            if (query.PackageNameWithPseudoSchema == KeePass.AndroidAppScheme+"android" || query.PackageNameWithPseudoSchema == KeePass.AndroidAppScheme + this.PackageName)
                 return false;
             if (!isManual)
             {