Changes to allow the TayTOTP plugin to work with versions of KeePass …

…above 2.42. A breaking change was introduced in version 2.42 which caused the TrayTOTP plugin to be incompatible (See here: https://sourceforge.net/p/keepass/discussion/329220/thread/5ef408ed35/). This fix allows the TRayTOTP plugin to work with versions of KeePass above 2.42 and whilst also retaining backwards compatibility with versions below 2.42.
craigtp · May 7, 2019 · c61c35c · c61c35c
1 parent 76f1cfd
commit c61c35c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/TrayTotp_Plugin.cs b/src/TrayTotp_Plugin.cs
@@ -36,6 +36,7 @@ internal sealed partial class TrayTotpGTExt : Plugin
         /// </summary>
         internal const string keeobj_string_EntryContextMenuCopyPassword_Name = "m_ctxEntryCopyPassword";
         internal const string keeobj_string_EntryContextMenuEntriesSubMenu_Name = "m_ctxEntryMassModify";
+        internal const string keeobj_string_EntryContextMenuEntriesSubMenu_NameAlternative = "m_ctxEntryEditQuick";
         internal const string keeobj_string_EntryContextMenuEntriesSubMenuSeperator1_Name = "m_ctxEntrySelectedSep1";
         /// <summary>
         /// Constants (custom string key).
@@ -235,7 +236,17 @@ public override bool Initialize(IPluginHost host)
             enMenuSetupTotp.Image = Properties.Resources.TOTP_Setup;
             enMenuSetupTotp.ShortcutKeys = (Keys)Shortcut.CtrlShiftI;
             enMenuSetupTotp.Click += OnEntryMenuSetupClick;
-            var ContextMenu = (ToolStripMenuItem)m_host.MainWindow.EntryContextMenu.Items.Find(keeobj_string_EntryContextMenuEntriesSubMenu_Name, true)[0];
+            ToolStripMenuItem ContextMenu;
+            try
+            {
+                //For KeePass versions 2.41 or below.
+                ContextMenu = (ToolStripMenuItem) m_host.MainWindow.EntryContextMenu.Items.Find(keeobj_string_EntryContextMenuEntriesSubMenu_Name, true)[0];
+            }
+            catch
+            {
+                // For KeePass versions 2.42 and above.
+                ContextMenu = (ToolStripMenuItem)m_host.MainWindow.EntryContextMenu.Items.Find(keeobj_string_EntryContextMenuEntriesSubMenu_NameAlternative, true)[0];
+            }
             ContextMenu.DropDownItems.Insert(ContextMenu.DropDownItems.IndexOfKey(keeobj_string_EntryContextMenuEntriesSubMenuSeperator1_Name) + 1, enMenuSetupTotp);
             enMenuSeperator = new ToolStripSeparator();
             ContextMenu.DropDownItems.Insert(ContextMenu.DropDownItems.IndexOf(enMenuSetupTotp) + 1, enMenuSeperator);