Fixed issues in CurrentGroup.

Author: shugaoye

KPCLib.xunit/PxDatabaseTests.cs

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

PassXYZLib/PxDatabase.cs

@@ -9,7 +9,9 @@ namespace PassXYZLib
 {
     public class PxDatabase : PwDatabase
     {
-		/// <summary>
+		private PwGroup m_pwCurrentGroup = null;
+
+ 		/// <summary>
 		/// If this is <c>true</c>, a database is currently open.
 		/// </summary>
 		public new bool IsOpen
@@ -155,31 +157,57 @@ public class PxDatabase : PwDatabase
 
 		public PwGroup CurrentGroup
 		{
-			get { 
-				if(this.RootGroup.Uuid == this.LastSelectedGroup) 
-					{ return this.RootGroup; }
+			get {
+				if(RootGroup.Uuid == LastSelectedGroup || LastSelectedGroup.Equals(PwUuid.Zero)) 
+				{
+					LastSelectedGroup = RootGroup.Uuid;
+					m_pwCurrentGroup = RootGroup;
+				}
+				return m_pwCurrentGroup;
+			}
+			set {
+				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
+				LastSelectedGroup = value.Uuid;
+				if (RootGroup.Uuid == LastSelectedGroup || LastSelectedGroup.Equals(PwUuid.Zero))
+				{
+					LastSelectedGroup = RootGroup.Uuid;
+					m_pwCurrentGroup = RootGroup;
+				}
 				else
-					return this.RootGroup.FindGroup(this.LastSelectedGroup, true); 
+					m_pwCurrentGroup = RootGroup.FindGroup(LastSelectedGroup, true);
 			}
-			set { this.LastSelectedGroup = value.Uuid; }
 		}
 
 		public string CurrentPath 
 		{ 
 			get {
-				var group = this.CurrentGroup;
-				string path = this.CurrentGroup.Name + "/";
-
-				while (this.RootGroup.Uuid != group.Uuid)
+				if(CurrentGroup == null) 
 				{
-					group = group.ParentGroup;
-					path = group.Name + "/" + path;
+					return null;
 				}
+				else 
+				{
+					var group = CurrentGroup;
+					string path = group.Name + "/";
 
-				return path;
+					while (RootGroup.Uuid != group.Uuid)
+					{
+						group = group.ParentGroup;
+						path = group.Name + "/" + path;
+					}
+
+					return path;
+				}
 			}
 		}
 
+		/// <summary>
+		/// Constructs an empty password manager object.
+		/// </summary>
+		public PxDatabase() : base()
+		{
+		}
+
 		private void EnsureRecycleBin(ref PwGroup pgRecycleBin)
 		{
 			if (pgRecycleBin == this.RootGroup)

README.md

@@ -11,6 +11,10 @@ This is a port of KeePassLib to PCL and .netstandard so that it can be used to b
 
 ## Changes:
 
+### Release 1.2.0
+ - Added PassXYZLib
+ - Support KPCLibPy
+
 ### Release 1.1.9
  - Removed dependency of Xamarin.Forms so it can be built with any .Netstandard apps
  - Using SkiaSharp to handle Bitmap which is supported by .Netstandard and .Net Core