remove potential password in logs

src/KeePassLib2Android/Serialization/FileLock.cs

@@ -185,7 +185,7 @@ namespace KeePassLib.Serialization
 					byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString());
 
 					s = IOConnection.OpenWrite(iocLockFile);
-					if(s == null) throw new IOException(iocLockFile.GetDisplayName());
+					if(s == null) throw new IOException(UrlUtil.GetFileName(iocLockFile.Path));
 					s.Write(pbFile, 0, pbFile.Length);
 				}
 				finally { if(s != null) s.Close(); }
@@ -205,8 +205,7 @@ namespace KeePassLib.Serialization
 			if(lfiEx != null)
 			{
 				m_iocLockFile = null; // Otherwise Dispose deletes the existing one
-				throw new FileLockException(iocBaseFile.GetDisplayName(),
+				throw new FileLockException(UrlUtil.GetFileName(iocBaseFile.Path), lfiEx.GetOwner());
-					lfiEx.GetOwner());
 			}
 
 			LockFileInfo.Create(m_iocLockFile);

src/KeePassLib2Android/Utility/MessageService.cs

@@ -28,6 +28,7 @@ using System.Diagnostics;
 
 using KeePassLib.Resources;
 using KeePassLib.Serialization;
+using Android.Webkit;
 
 namespace KeePassLib.Utility
 {
@@ -411,7 +412,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
 		public static void ShowLoadWarning(IOConnectionInfo ioConnection, Exception ex)
 		{
 			if (ioConnection != null)
-				ShowLoadWarning(ioConnection.GetDisplayName(), ex, false);
+				ShowLoadWarning(UrlUtil.GetFileName(ioConnection.Path), ex, false);
 			else ShowWarning(ex);
 		}
 
@@ -444,7 +445,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
 			bool bCorruptionWarning)
 		{
 			if (ioConnection != null)
-				ShowSaveWarning(ioConnection.GetDisplayName(), ex, bCorruptionWarning);
+				ShowSaveWarning(UrlUtil.GetFileName(ioConnection.Path), ex, bCorruptionWarning);
 			else ShowWarning(ex);
 		}
 

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/Kp2aBusinessLogic/Io/CachingFileStorage.cs

@@ -124,7 +124,7 @@ namespace keepass2android.Io
 				&& File.Exists(VersionFilePath(ioc))
 				&& File.Exists(BaseVersionFilePath(ioc));
 
-			Kp2aLog.Log(ioc.GetDisplayName() + " isCached = " + result);
+			Kp2aLog.Log(GetDisplayName(ioc) + " isCached = " + result);
 
             return result;
         }
@@ -598,13 +598,14 @@ namespace keepass2android.Io
 		public string GetBaseVersionHash(IOConnectionInfo ioc)
 		{
 			string hash = File.ReadAllText(BaseVersionFilePath(ioc));
-            Kp2aLog.Log(ioc.GetDisplayName() + " baseVersionHash = " + hash);
+            Kp2aLog.Log(GetDisplayName(ioc) + " baseVersionHash = " + hash);
 			return hash;
         }
 		public string GetLocalVersionHash(IOConnectionInfo ioc)
 		{
 			string hash = File.ReadAllText(VersionFilePath(ioc));
-            Kp2aLog.Log(ioc.GetDisplayName() + " localVersionHash = " + hash);
+			
+            Kp2aLog.Log(GetDisplayName(ioc) + " localVersionHash = " + hash);
 			return hash;
 		}
 		public bool HasLocalChanges(IOConnectionInfo ioc)

src/Kp2aBusinessLogic/Io/JavaFileStorage.cs

@@ -348,7 +348,7 @@ namespace keepass2android.Io
 			}
 			catch (Exception e)
 			{
-				throw new Exception("Error finding " + filename + " in " + folderPath.GetDisplayName(), e);
+				throw new Exception("Error finding " + filename + " in " + GetDisplayName(folderPath), e);
 			}
 			
 		}

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>

src/keepass2android/addons/OtpKeyProv/OathHotpKeyProv.cs

@@ -129,7 +129,7 @@ namespace OtpKeyProv
 			if(!OtpInfo.Save(auxFileIoc, otpInfo))
 			{
 				MessageService.ShowWarning("Failed to save auxiliary OTP info file:",
-					auxFileIoc.GetDisplayName());
+                    UrlUtil.GetFileName(auxFileIoc.Path));
 				return false;
 			}