Fix default fallback of placeholder handling setting on entries

Fixes #147
kee-org · Jun 12, 2024 · 6fd3031 · 6fd3031
1 parent bc65cdb
commit 6fd3031
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/KeePassRPC/KeePassRPCExt.cs b/KeePassRPC/KeePassRPCExt.cs
@@ -39,7 +39,7 @@ namespace KeePassRPC
     public sealed class KeePassRPCExt : Plugin
     {
         // version information
-        public static readonly Version PluginVersion = new Version(2, 0, 1);
+        public static readonly Version PluginVersion = new Version(2, 0, 2);
 
         public override string UpdateUrl
         {

diff --git a/KeePassRPC/KeePassRPCService.DTOV1.cs b/KeePassRPC/KeePassRPCService.DTOV1.cs
@@ -93,8 +93,9 @@ private LightEntry GetEntryFromPwEntry(PwEntry pwe, EntryConfigv2 conf, int matc
                     }
                 }
 
-                if (ff.PlaceholderHandling == PlaceholderHandling.Enabled ||
-                    (ff.PlaceholderHandling == PlaceholderHandling.Default &&
+                var fieldPlaceholderHandling = ff.PlaceholderHandling.GetValueOrDefault(PlaceholderHandling.Default);
+                if (fieldPlaceholderHandling == PlaceholderHandling.Enabled ||
+                    (fieldPlaceholderHandling == PlaceholderHandling.Default &&
                      dbDefaultPlaceholderHandlingEnabled))
                 {
                     enablePlaceholders = true;

diff --git a/KeePassRPC/KeePassRPCService.DTOV2.cs b/KeePassRPC/KeePassRPCService.DTOV2.cs
@@ -59,9 +59,10 @@ private LightEntry2 GetEntry2FromPwEntry(PwEntry pwe, EntryConfigv2 conf, int ma
             {
                 if (!fullDetails && field.ValuePath != PwDefs.UserNameField)
                     continue;
-
-                bool enablePlaceholders = field.PlaceholderHandling == PlaceholderHandling.Enabled ||
-                                          (field.PlaceholderHandling == PlaceholderHandling.Default &&
+
+                var fieldPlaceholderHandling = field.PlaceholderHandling.GetValueOrDefault(PlaceholderHandling.Default);
+                bool enablePlaceholders = fieldPlaceholderHandling == PlaceholderHandling.Enabled ||
+                                          (fieldPlaceholderHandling == PlaceholderHandling.Default &&
                                            dbDefaultPlaceholderHandlingEnabled);
 
                 string ffValue = field.ValuePath == "."

diff --git a/KeePassRPC/Properties/AssemblyInfo.cs b/KeePassRPC/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: Guid("89631AAE-8DE6-4593-8DAB-AB28490A490A")]
 
 // Assembly version information
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")] // also change AssemblyVersion and PluginVersion in KeePassRPCExt.cs!
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")] // also change AssemblyVersion and PluginVersion in KeePassRPCExt.cs!