Prepare for KeePass 2.61

If the option 'Check for update at KeePass startup' is activated, KeePass 2.61 will initiate the update check before trying to open a database (asynchronously). If an update is found while a master key prompt dialog is displayed, the availability of the update is now indicated by a banner in the dialog.
As preparation for that, this part has been removed from EarlyUpdateCheck if KeePass >= 2.61 is used.

One-Click plugin update and the enhancements to the plugins form are still available

Author: Rookiestyle

readme.md

@@ -4,11 +4,12 @@
 [![Downloads](https://img.shields.io/github/downloads/rookiestyle/earlyupdatecheck/total?color=%2300cc00)](https://github.com/rookiestyle/earlyupdatecheck/releases/latest/download/EarlyUpdateCheck.plgx)\
 [![License: GPL v3](https://img.shields.io/github/license/rookiestyle/earlyupdatecheck)](https://www.gnu.org/licenses/gpl-3.0)
 
-Keepass performs its update check only after all initialization is done and - if configured - the most recently used database has been opened.
-
+Keepass performs its update check only after all initialization is done and - if configured - the most recently used database has been opened.  
 EarlyUpdateCheck helps to run this checks for updates of KeePass and installed plugins BEFORE a database is opened.  
-Additionally, it offers a handy one click update mode for all of my plugins integrated in KeePass' update check and also supports updating KeePass itself. 
-This will invoke Windows UAC if required to copy the downloaded files into KeePass' plugin folder. 
+This feature will become part of the next KeePass release 2.61. EarlyUpdateCheck will check the KeePass version and and only use its early update check for KeePass < 2.61.
+
+Additionally, it offers a handy one click update mode for all of my plugins integrated in KeePass' update check and also supports updating KeePass itself.  
+This will invoke Windows UAC if required to copy the downloaded files into KeePass' plugin folder.  
 Details can be found in the configuration settings.
 
 EarlyUpdateCheck can update other author's plugins as well.

src/EarlyUpdateCheck.cs

@@ -151,7 +151,7 @@ private void WindowAdded(object sender, GwmWindowEventArgs e)
         }
         return;
       }
-      if (e.Form is KeyPromptForm) KeyPromptFormAdded();
+      if (e.Form is KeyPromptForm && Tools.KeePassVersion < PluginConfig.KeePass_2_61) KeyPromptFormAdded();
       if (e.Form is LanguageForm) e.Form.Shown += LanguageFormAdded;
       if (e.Form is PluginsForm) e.Form.Shown += PluginsFormShown;
     }
@@ -320,6 +320,18 @@ private void UpdateCheckBackground()
             foreach (UpdateComponentInfo uc in lInst)
             {
               var mypu = PluginUpdateHandler.Plugins.Find(xyz => xyz.Title == uc.Name);
+              if (uc.Name == "KeePass")
+              {
+                if (uc.Status == UpdateComponentStatus.NewVerAvailable && PluginConfig.KeePassUpdateActive)
+                {
+                  Version v = null;
+                  try { v = new Version(StrUtil.VersionToString(uc.VerAvailable, 2)); }
+                  catch { }
+                  bUpdAvail = true;
+                }
+                continue;
+              }
+
               if (uc.Status == UpdateComponentStatus.NewVerAvailable && mypu != null)
               {
                 mypu.VersionAvailable = new Version(StrUtil.VersionToString(uc.VerAvailable, 2));
@@ -481,7 +493,6 @@ private UpdateCheckType UpdateCheckRequired()
     {
       UpdateCheckType result = UpdateCheckType.NotRequired;
       if (m_bUpdateCheckDone) return result;
-
       m_bUpdateCheckDone = true;
       if (!KeePass.Program.Config.Application.Start.CheckForUpdate) return result;
       if (!KeePass.Program.Config.Application.Start.OpenLastFile) return result;

src/Options.cs

@@ -60,6 +60,13 @@ public Options()
       var t = typeof(KPRes).GetProperty("Type");
       if (t != null) lKeePassInstallType.Text = t.GetValue(null, null) + ":";
       else lKeePassInstallType.Text = "Type:";
+
+      if (PluginTools.Tools.KeePassVersion >= PluginConfig.KeePass_2_61)
+      {
+        cbCheckSync.Visible = false;// PluginTools.Tools.KeePassVersion < PluginConfig.KeePass_2_61;
+        tbCheckSyncDesc.Visible = false;// PluginTools.Tools.KeePassVersion < PluginConfig.KeePass_2_61;
+        gCheckSync.Height -= cbCheckSync.Height + tbCheckSyncDesc.Height;
+      }
     }
 
     private void bUpdateTranslations_Click(object sender, EventArgs e)

src/Properties/AssemblyInfo.cs

@@ -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.4.1")]
-[assembly: AssemblyFileVersion("4.4.1")]
+[assembly: AssemblyVersion("4.4.2")]
+[assembly: AssemblyFileVersion("4.4.2")]
 [assembly: Guid("672570AF-CC57-4980-86F9-D48FD1CC707D")]

src/Utilities/Util.cs

@@ -31,6 +31,7 @@ internal static class PluginConfig
     internal static bool CheckSync = true;
     internal static bool OneClickUpdate = true;
     internal static bool DownloadActiveLanguage = true;
+    internal static Version KeePass_2_61 = new Version(2, 61);
 
     private static List<PluginUpdateSerialized> m_lKnownPlugins = new List<PluginUpdateSerialized>();
     internal static List<PluginUpdateSerialized> KnownPluginVersions

version.info

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