From 65e61f437d1ad7ac5b744cafae78fce03b5ec374 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 3 Nov 2021 17:09:48 +0100
Subject: [PATCH] Revert "Refactoring"

This reverts commit af0afc955c068ef17890deeb6bdf0f6692be9cd3.
---
 .../eu/faircode/email/FragmentCompose.java    | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 90ef94c92a..0c138230a5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1459,20 +1459,6 @@ public class FragmentCompose extends FragmentBase {
         pgpService.bindToService();
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        bottom_navigation.findViewById(R.id.action_send).setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                Bundle args = new Bundle();
-                args.putBoolean("force_dialog", true);
-                onAction(R.id.action_check, args, "force");
-                return true;
-            }
-        });
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -1670,6 +1656,16 @@ public class FragmentCompose extends FragmentBase {
             bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_encrypt);
         else
             bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_send);
+
+        bottom_navigation.findViewById(R.id.action_send).setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                Bundle args = new Bundle();
+                args.putBoolean("force_dialog", true);
+                onAction(R.id.action_check, args, "force");
+                return true;
+            }
+        });
     }
 
     @Override