From fdcb62fb95bd02bbb14797c2972103f878c47d95 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 27 Oct 2020 23:10:44 +0100
Subject: [PATCH] Small behavior improvement

---
 .../eu/faircode/email/FragmentCompose.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 16c6e1c0e5..0935f231fb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -470,20 +470,20 @@ public class FragmentCompose extends FragmentBase {
         });
 
         etBody.setSelectionListener(new EditTextCompose.ISelection() {
-            private boolean style = false;
             private boolean styling = false;
 
             @Override
-            public void onSelected(boolean selection) {
+            public void onSelected(final boolean selection) {
                 if (media) {
-                    style = selection;
                     getMainHandler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            if (style != styling) {
-                                styling = style;
+                            if (styling != selection) {
+                                styling = selection;
                                 media_bar.getMenu().clear();
-                                media_bar.inflateMenu(styling ? R.menu.action_compose_style_alt : R.menu.action_compose_media);
+                                media_bar.inflateMenu(styling
+                                        ? R.menu.action_compose_style_alt
+                                        : R.menu.action_compose_media);
                             }
                         }
                     }, 20);
@@ -1550,9 +1550,11 @@ public class FragmentCompose extends FragmentBase {
         media = !media;
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         prefs.edit().putBoolean("compose_media", media).apply();
-        media_bar.setVisibility(media ? View.VISIBLE : View.GONE);
+        etBody.setSelection(etBody.getSelectionStart());
         media_bar.getMenu().clear();
-        media_bar.inflateMenu(media && etBody.hasSelection() ? R.menu.action_compose_style_alt : R.menu.action_compose_media);
+        media_bar.inflateMenu(R.menu.action_compose_media);
+        media_bar.setVisibility(media ? View.VISIBLE : View.GONE);
+        style_bar.setVisibility(View.GONE);
     }
 
     private void onMenuCompact() {