Internal improvements

Author: Rookiestyle

src/EarlyUpdateCheck.cs

@@ -423,7 +423,7 @@ private bool ContinueWork()
         var c = UIThread(() =>
         {
           bool cw = false;
-          lock (m_slUpdateCheck)
+          lock (m_lock) //lock (m_lockUpdateCheck)
           {
             if (m_slUpdateCheck == null) cw = false;
             else cw = m_slUpdateCheck.ContinueWork();
@@ -440,7 +440,7 @@ private void EndLogging()
     {
       UIThread(() =>
       {
-        lock (m_slUpdateCheck)
+        lock (m_lock) //lock (m_lockUpdateCheck)
         {
           if (m_slUpdateCheck != null) m_slUpdateCheck.EndLogging();
           m_slUpdateCheck = null;
@@ -645,6 +645,7 @@ private void OnUpdateCheckFormShown(object sender, EventArgs e)
           }
           continue;
         }
+        bool bFoundPluginUpdateDetails = false;
         foreach (PluginUpdate upd in PluginUpdateHandler.Plugins)
         {
           if (item.SubItems[0].Text != upd.Title) continue;
@@ -655,6 +656,7 @@ private void OnUpdateCheckFormShown(object sender, EventArgs e)
             lvPlugins.KeyPress += LvPlugins_KeyPress;
             bColumnAdded = true;
           }
+          bFoundPluginUpdateDetails = true;
           ListViewItem.ListViewSubItem lvsiUpdate = new ListViewItem.ListViewSubItem(item, PluginTranslate.PluginUpdate);
           lvsiUpdate.Name = "EarlyUpdateCheck_UpdateColumn_Item" + item.Index.ToString();
           lvsiUpdate.Tag = upd;
@@ -676,10 +678,13 @@ private void OnUpdateCheckFormShown(object sender, EventArgs e)
           }
           break;
         }
-        var opns = new OtherPluginNotSupported(item.SubItems[0].Text);
-        opns.SetData(item.SubItems[2].Text, item.SubItems[3].Text);
-        PluginUpdateHandler.Plugins.RemoveAll(x => x.Title == opns.Title);
-        PluginUpdateHandler.Plugins.Add(opns);
+        if (!bFoundPluginUpdateDetails)
+        {
+          var opns = new OtherPluginNotSupported(item.SubItems[0].Text);
+          opns.SetData(item.SubItems[2].Text, item.SubItems[3].Text);
+          PluginUpdateHandler.Plugins.RemoveAll(x => x.Title == opns.Title);
+          PluginUpdateHandler.Plugins.Add(opns);
+        }
       }
       PluginConfig.SetKnownPluginVersions(PluginUpdateHandler.Plugins);
       if (bColumnAdded)
@@ -876,7 +881,7 @@ private void SetUpdateButtonText(Button bUpdate, object oKeePassUpdate)
         bUpdate.Text = kpu.Selected ? PluginTranslate.PluginUpdate : PluginTranslate.PluginUpdateSelected;
       }
       else if (bAtLeast1PluginSelected) bUpdate.Text = PluginTranslate.PluginUpdateSelected;
-      else if (kpu != null & kpu.Selected) bUpdate.Text = PluginTranslate.PluginUpdateKeePass;
+      else if (kpu != null && kpu.Selected) bUpdate.Text = PluginTranslate.PluginUpdateKeePass;
       else
       {
         bUpdate.Enabled = false;

src/EarlyUpdateCheck.csproj

@@ -21,7 +21,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>EarlyUpdateCheck</RootNamespace>
     <AssemblyName>EarlyUpdateCheck</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <NoWin32Manifest>False</NoWin32Manifest>
     <SignAssembly>False</SignAssembly>
@@ -92,11 +92,21 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DotNetZip.Reduced">
+      <Version>1.9.1.8</Version>
+      <ExcludeFromPlgx />
+    </PackageReference>
+    <PackageReference Include="PlgxTool">
+      <Version>1.0.0</Version>
+      <ExcludeFromPlgx />
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\_KeePass_Source\KeePass\KeePass.csproj">
       <Project>{10938016-dee2-4a25-9a5a-8fd3444379ca}</Project>
       <Name>KeePass</Name>
-      <!--
+<!--
   We do use the nuget package protobuf-net
   Unfortunately, the dll files created during compile time won't be added to the plgx file
   
@@ -107,16 +117,6 @@
       <PlgxReference>bin\Release\Ionic.Zip.Reduced.dll</PlgxReference>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="DotNetZip.Reduced">
-      <Version>1.9.1.8</Version>
-      <ExcludeFromPlgx />
-    </PackageReference>
-    <PackageReference Include="PlgxTool">
-      <Version>1.0.0</Version>
-      <ExcludeFromPlgx />
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' ">
     <Exec Command="..\translationcopy.cmd $(Configuration)" />

src/Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("rookiestyle")]
 [assembly: AssemblyProduct("KeePass Plugin")]
-[assembly: AssemblyCopyright("Copyright 2021-2025")]
+[assembly: AssemblyCopyright("Copyright © rookiestyle")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // This sets the default COM visibility of types in the assembly to invisible.
@@ -26,6 +26,6 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("4.3")]
-[assembly: AssemblyFileVersion("4.3")]
+[assembly: AssemblyVersion("4.4")]
+[assembly: AssemblyFileVersion("4.4")]
 [assembly: Guid("672570AF-CC57-4980-86F9-D48FD1CC707D")]

version.info

@@ -1,5 +1,5 @@
 :
-Early update check:4.3
+Early update check:4.4
 Early update check!de:9
 Early update check!ru:2
 Early update check!fr:1