fix delay in showing secure actions menu buttons

Author: martgil

extension/js/content_scripts/webmail/generic/webmail-element-replacer.ts

@@ -14,7 +14,6 @@ export abstract class WebmailElementReplacer {
   public abstract reinsertReplyBox: (replyMsgId: string) => void;
   public abstract scrollToReplyBox: (replyMsgId: string) => void;
   public abstract scrollToCursorInReplyBox: (replyMsgId: string, cursorOffsetTop: number) => void;
-  public abstract addSecureActionsToMessageMenu: () => void;
 
   public runIntervalFunctionsPeriodically = () => {
     const intervalFunctions = this.getIntervalFunctions();

extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts

@@ -148,24 +148,6 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     }
   };
 
-  public addSecureActionsToMessageMenu = () => {
-    const retryInterval = 100;
-    const addButtons = () => {
-      if (!$(this.sel.msgActionsBtn).length) {
-        Catch.setHandledTimeout(addButtons, retryInterval);
-      } else {
-        $(document).on('click', 'div.aHU.hx', () => {
-          if (!$('.action_menu_message_button').length) {
-            this.addMenuButton('a_reply', '#r');
-            this.addMenuButton('a_reply_all', '#r2');
-            this.addMenuButton('a_forward', '#r3');
-          }
-        });
-      }
-    };
-    addButtons();
-  };
-
   private everything = () => {
     this.replaceArmoredBlocks().catch(Catch.reportErr);
     this.replaceAttachments().catch(Catch.reportErr);
@@ -174,6 +156,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     this.replaceStandardReplyBox().catch(Catch.reportErr);
     this.evaluateStandardComposeRecipients().catch(Catch.reportErr);
     this.addSettingsBtn();
+    this.addSecureActionsToMessageMenu();
     this.renderLocalDrafts().catch(Catch.reportErr);
   };
 
@@ -934,4 +917,15 @@ export class GmailElementReplacer extends WebmailElementReplacer {
       }
     }
   };
+
+  private addSecureActionsToMessageMenu = () => {
+    const addSecureOptionsToGmail = () => {
+      if ($(this.sel.msgActionsMenu).is(':visible') && !$('.action_menu_message_button').length) {
+        this.addMenuButton('a_reply', '#r');
+        this.addMenuButton('a_reply_all', '#r2');
+        this.addMenuButton('a_forward', '#r3');
+      }
+    };
+    Catch.setHandledTimeout(addSecureOptionsToGmail, 100);
+  };
 }

extension/js/content_scripts/webmail/gmail/gmail-webmail-startup.ts

@@ -45,7 +45,6 @@ export class GmailWebmailStartup {
     const messageRenderer = await MessageRenderer.newInstance(acctEmail, new Gmail(acctEmail), relayManager, factory);
     this.replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, messageRenderer, injector, notifications, relayManager);
     await notifications.showInitial(acctEmail);
-    this.replacer.addSecureActionsToMessageMenu();
     this.replacer.runIntervalFunctionsPeriodically();
   };