From fb018946b993186c0e21d85f6714f79e4221487c Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Thu, 28 Dec 2017 21:59:55 +0100
Subject: [PATCH] minor refactoring

---
 .../AutofillBase/AutofillFieldMetadataCollection.cs  |  2 +-
 .../services/AutofillBase/AutofillHelper.cs          |  2 +-
 .../services/AutofillBase/StructureParser.cs         | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs b/src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs
index d02434ae..d34fe3f7 100644
--- a/src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs
+++ b/src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs
@@ -12,7 +12,7 @@ namespace keepass2android.services.AutofillBase
 	public class AutofillFieldMetadataCollection
 	{
 		List<AutofillId> AutofillIds = new List<AutofillId>();
-		Dictionary<string, List<keepass2android.services.AutofillBase.AutofillFieldMetadata>> AutofillHintsToFieldsMap = new Dictionary<string, List<AutofillBase.AutofillFieldMetadata>>();
+		Dictionary<string, List<AutofillFieldMetadata>> AutofillHintsToFieldsMap = new Dictionary<string, List<AutofillFieldMetadata>>();
 		public List<string> AllAutofillHints { get; }
 		public List<string> FocusedAutofillHints { get; }
 		int Size = 0;
diff --git a/src/keepass2android/services/AutofillBase/AutofillHelper.cs b/src/keepass2android/services/AutofillBase/AutofillHelper.cs
index cc15f766..d8f83f73 100644
--- a/src/keepass2android/services/AutofillBase/AutofillHelper.cs
+++ b/src/keepass2android/services/AutofillBase/AutofillHelper.cs
@@ -24,7 +24,7 @@ namespace keepass2android.services.AutofillBase
 		/// <param name="filledAutofillFieldCollection">Filled autofill field collection.</param>
 		/// <param name="datasetAuth">If set to <c>true</c> dataset auth.</param>
 		public static Dataset NewDataset(Context context,
-				keepass2android.services.AutofillBase.AutofillFieldMetadataCollection autofillFields, FilledAutofillFieldCollection filledAutofillFieldCollection, bool datasetAuth, IAutofillIntentBuilder intentBuilder) 
+				AutofillFieldMetadataCollection autofillFields, FilledAutofillFieldCollection filledAutofillFieldCollection, bool datasetAuth, IAutofillIntentBuilder intentBuilder) 
 		{
 			var datasetName = filledAutofillFieldCollection.DatasetName;
 			if (datasetName != null)
diff --git a/src/keepass2android/services/AutofillBase/StructureParser.cs b/src/keepass2android/services/AutofillBase/StructureParser.cs
index 282543ab..6c0f751d 100644
--- a/src/keepass2android/services/AutofillBase/StructureParser.cs
+++ b/src/keepass2android/services/AutofillBase/StructureParser.cs
@@ -14,7 +14,7 @@ namespace keepass2android.services.AutofillBase
 	public sealed class StructureParser
 	{
 	    public Context mContext { get; }
-	    public keepass2android.services.AutofillBase.AutofillFieldMetadataCollection AutofillFields { get; set; }
+	    public AutofillFieldMetadataCollection AutofillFields { get; set; }
 		AssistStructure Structure;
 		public FilledAutofillFieldCollection ClientFormData { get; set; }
 
@@ -22,7 +22,7 @@ namespace keepass2android.services.AutofillBase
 		{
 		    mContext = context;
 		    Structure = structure;
-			AutofillFields = new keepass2android.services.AutofillBase.AutofillFieldMetadataCollection();
+			AutofillFields = new AutofillFieldMetadataCollection();
 		}
 
 		public string ParseForFill()
@@ -42,7 +42,7 @@ namespace keepass2android.services.AutofillBase
 		/// <param name="forFill">If set to <c>true</c> for fill.</param>
 		string Parse(bool forFill)
 		{
-			Log.Debug(keepass2android.services.AutofillBase.CommonUtil.Tag, "Parsing structure for " + Structure.ActivityComponent);
+			Log.Debug(CommonUtil.Tag, "Parsing structure for " + Structure.ActivityComponent);
 			var nodes = Structure.WindowNodeCount;
 			ClientFormData = new FilledAutofillFieldCollection();
 		    String webDomain = null;
@@ -61,12 +61,12 @@ namespace keepass2android.services.AutofillBase
 		            throw new Java.Lang.SecurityException(mContext.GetString(
 		                Resource.String.invalid_link_association, webDomain, packageName));
 		        }
-                Log.Debug(keepass2android.services.AutofillBase.CommonUtil.Tag, $"Domain {webDomain} is valid for {packageName}");
+                Log.Debug(CommonUtil.Tag, $"Domain {webDomain} is valid for {packageName}");
 		    }
 		    else
 		    {
 		        webDomain = "androidapp://" + packageName;
-                Log.Debug(keepass2android.services.AutofillBase.CommonUtil.Tag, "no web domain. Using package name.");
+                Log.Debug(CommonUtil.Tag, "no web domain. Using package name.");
 		    }
 		    return webDomain;
 		}
@@ -76,7 +76,7 @@ namespace keepass2android.services.AutofillBase
 		    String webDomain = viewNode.WebDomain;
 		    if (webDomain != null)
 		    {
-		        Log.Debug(keepass2android.services.AutofillBase.CommonUtil.Tag, $"child web domain: {webDomain}");
+		        Log.Debug(CommonUtil.Tag, $"child web domain: {webDomain}");
 		        if (!string.IsNullOrEmpty(validWebdomain))
 		        {
 		            if (webDomain == validWebdomain)