Merge pull request #17 from shugaoye/master

Build 1.3.8

Author: passxyz

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Change log
 
+### Release 1.3.8
+
 ### Release 1.3.7
 **KPCLib**
  - Added `GetOtpUrl()`

KPCLib.nuspec

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

KPCLib.xunit/KPCLib.xunit.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="PassXYZ" Version="2.1.4.9" />
+    <PackageReference Include="PassXYZ" Version="2.1.4.11" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.2" />
     <PackageReference Include="Svg.Skia" Version="0.5.3" />

KPCLib.xunit/PxDatabaseTests.cs

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

KPCLib/KPCLib.csproj

@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <StartupObject />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.7</Version>
+    <Version>1.3.8</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>
@@ -15,8 +15,8 @@
     <Company>PassXYZ Inc.</Company>
     <PackageReleaseNotes></PackageReleaseNotes>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <AssemblyVersion>1.3.7.0</AssemblyVersion>
-    <FileVersion>1.3.7.0</FileVersion>
+    <AssemblyVersion>1.3.8.0</AssemblyVersion>
+    <FileVersion>1.3.8.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

KPCLib/PassXYZLib/PxDefs.cs

@@ -133,6 +133,10 @@ public static class PxDefs
         public const string all_txt = "*.txt";
 
         public const string PxKeyFile = "pxkey://";
+        public const string PxJsonData = "pxdat://";
+        public const string PxJsonTemplate = "pxtem://";
+
+        public const int QR_CODE_MAX_LEN = 1152;
 
         /// <summary>
         /// PassXYZ customization data keys, please refer to chapter 17
@@ -208,12 +212,16 @@ public static string GetUserNameFromFileName(string fileName, PxFileType fileTyp
 
         public static bool IsDeviceLockEnabled(string filename)
         {
+            if (string.IsNullOrEmpty(filename)) { return false; }
+
             if (filename.StartsWith(head_data)) return true;
             else return false;
         }
 
         public static bool IsPxEntry(PwEntry entry)
         {
+            if (entry == null) { return false; }
+
             if (entry.CustomData.Get(PxCustomDataItemSubType) == ItemSubType.PxEntry.ToString())
                 return true;
             else
@@ -222,6 +230,8 @@ public static bool IsPxEntry(PwEntry entry)
 
         public static bool IsNotes(PwEntry entry)
         {
+            if (entry == null) { return false; }
+
             if (entry.CustomData.Get(PxCustomDataItemSubType) == ItemSubType.Notes.ToString())
                 return true;
             else

PassXYZLib.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>PassXYZLib</id>
-        <version>1.3.7.0</version>
+        <version>1.3.8.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -17,8 +17,8 @@
 		<repository url="https://github.com/passxyz/KPCLib" />
 		<dependencies>
 		  <group targetFramework=".NETStandard2.0">
-      <dependency id="PassXYZ" version="2.1.4.9" exclude="Build,Analyzers" />
-			<dependency id="KPCLib" version="1.3.2.0" exclude="Build,Analyzers" />
+      <dependency id="PassXYZ" version="2.1.4.11" exclude="Build,Analyzers" />
+			<dependency id="KPCLib" version="1.3.8.0" exclude="Build,Analyzers" />
       <dependency id="SkiaSharp" version="2.80.2" exclude="Build,Analyzers" />
       </group>
 		</dependencies>

PassXYZLib/PassXYZLib.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.3.6</Version>
-    <AssemblyVersion>1.3.6.0</AssemblyVersion>
-    <FileVersion>1.3.6.0</FileVersion>
+    <Version>1.3.8</Version>
+    <AssemblyVersion>1.3.8.0</AssemblyVersion>
+    <FileVersion>1.3.8.0</FileVersion>
     <Company>PassXYZ Inc.</Company>
     <Authors>Roger Ye</Authors>
     <Copyright>Roger Ye</Copyright>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PassXYZ" Version="2.1.4.9" />
+    <PackageReference Include="PassXYZ" Version="2.1.4.11" />
   </ItemGroup>
 
   <ItemGroup>