Merge pull request #13 from shugaoye/master

Release 1.3.4

Author: passxyz

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change log
 
+### Release 1.3.4
+ - Bug fixes
+
 ### Release 1.3.3
  - Improved property `IsUserExist` and Added `Delete` method in `User`
  - Support KeePass key file

KPCLib.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>KPCLib</id>
-        <version>1.3.3.0</version>
+        <version>1.3.4.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>

KPCLib.sln

@@ -11,6 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PassXYZLib", "PassXYZLib\Pa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B5CFEC4A-7D25-4D24-B4F7-A568E1DF4750}"
 	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
 		CHANGELOG.md = CHANGELOG.md
 		KPCLib.nuspec = KPCLib.nuspec
 		PassXYZLib.nuspec = PassXYZLib.nuspec

KPCLib.xunit/PxDatabaseTests.cs

@@ -379,7 +379,7 @@ public class PxLibInfoTests
         public void PxLibVersion() 
         {
             Debug.WriteLine($"{PxLibInfo.Version}");
-            Assert.Equal(PxLibInfo.Version, new System.Version("1.3.3.0"));
+            Assert.Equal(PxLibInfo.Version, new System.Version("1.3.4.0"));
         }
 
         [Fact]

KPCLib/KPCLib.csproj

@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <StartupObject />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.3</Version>
+    <Version>1.3.4</Version>
     <PackageProjectUrl>https://github.com/passxyz/KPCLib</PackageProjectUrl>
     <RepositoryUrl>https://github.com/passxyz/KPCLib</RepositoryUrl>
     <Description>This is the build of KeePassLib in Xamarin Portable Class Library. Three platforms, UWP, Android and iOS, are supported and tested.</Description>
@@ -19,8 +19,8 @@
 - Removed dependency on PureOtp
 - Support KeePass key file</PackageReleaseNotes>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <AssemblyVersion>1.3.3.0</AssemblyVersion>
-    <FileVersion>1.3.3.0</FileVersion>
+    <AssemblyVersion>1.3.4.0</AssemblyVersion>
+    <FileVersion>1.3.4.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

PassXYZLib.nuspec

@@ -2,16 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>PassXYZLib</id>
-        <version>1.3.3.0</version>
+        <version>1.3.4.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<license type="expression">LGPL-3.0-or-later</license>
 		<projectUrl>https://github.com/passxyz/KPCLib</projectUrl>
 		<description>This is an extension of KPCLib.</description>
 		<releaseNotes>
-      - Removed dependencies
-      - Added Delete function in Class User
+      - Added FindEntryById()
     </releaseNotes>
 		<copyright>Roger Ye</copyright>
 		<repository url="https://github.com/passxyz/KPCLib" />

PassXYZLib/PassXYZLib.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.3.3</Version>
-    <AssemblyVersion>1.3.3.0</AssemblyVersion>
-    <FileVersion>1.3.3.0</FileVersion>
+    <Version>1.3.4</Version>
+    <AssemblyVersion>1.3.4.0</AssemblyVersion>
+    <FileVersion>1.3.4.0</FileVersion>
     <Company>PassXYZ Inc.</Company>
     <Authors>Roger Ye</Authors>
     <Copyright>Roger Ye</Copyright>

PassXYZLib/PxDatabase.cs

@@ -7,7 +7,7 @@
 using SkiaSharp;
 
 using KeePassLib;
-using KeePassLib.Interfaces;
+using KeePassLib.Delegates;
 using KeePassLib.Keys;
 using KeePassLib.Security;
 using KeePassLib.Serialization;
@@ -326,7 +326,7 @@ public void Open(PassXYZLib.User user)
 				}
 				catch (PassXYZ.Services.InvalidDeviceLockException ex)
                 {
-					try { cmpKey.AddUserKey(new KcpKeyFile(user.KeyFileName)); }
+					try { cmpKey.AddUserKey(new KcpKeyFile(user.KeFilePath)); }
 					catch (Exception exFile)
 					{
 						Debug.Write($"{exFile} in {ex}");
@@ -540,6 +540,33 @@ PwGroup FindSubgroup(PwGroup group, string name)
 		}
 
 
+		/// <summary>
+		/// Find an entry by Uuid
+		/// </summary>
+		/// <param name="uuid">The entry uuid</param>	
+		/// <returns>Entry found or return <c>null</c> if the entry cannot be found</returns>
+		public PwEntry FindEntryById(string id)
+		{
+			PwEntry targetEntry = null;
+
+			EntryHandler eh = delegate (PwEntry pe)
+			{
+				PwUuid pu = pe.Uuid;
+				string hexStr = pu.ToHexString();
+				if (hexStr.Equals(id))
+				{
+					targetEntry = pe;
+					return false;
+				}
+
+				return true;
+			};
+
+			RootGroup.TraverseTree(TraversalMethod.PreOrder, null, eh);
+
+			return targetEntry;
+		}
+
 		/// <summary>
 		/// Delete a group.
 		/// </summary>

PassXYZLib/User.cs

@@ -108,7 +108,7 @@ public class User
         /// This is because it is difficult to manage data file in mobile devices. The actual data file is encoded
         /// using base58 encoding with information such as key file or device lock enabled.
         /// </summary>
-        public string Username
+        virtual public string Username
         {
             get => _username;
             set