Conditionally added insert image / add attachment to overflow menu

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -744,12 +744,16 @@ public class FragmentCompose extends FragmentBase {
 
         menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
         menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
-        menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_style_toolbar).setVisible(state == State.LOADED);
+        menu.findItem(R.id.menu_image).setVisible(state == State.LOADED && !style);
+        menu.findItem(R.id.menu_attachment).setVisible(state == State.LOADED && !style);
+        menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_encrypt).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_send_after).setVisible(state == State.LOADED);
 
         menu.findItem(R.id.menu_zoom).setEnabled(!busy);
+        menu.findItem(R.id.menu_image).setEnabled(!busy);
+        menu.findItem(R.id.menu_attachment).setEnabled(!busy);
         menu.findItem(R.id.menu_clear).setEnabled(!busy);
         menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
         menu.findItem(R.id.menu_send_after).setEnabled(!busy);
@@ -774,12 +778,18 @@ public class FragmentCompose extends FragmentBase {
             case R.id.menu_zoom:
                 onMenuZoom();
                 return true;
-            case R.id.menu_clear:
-                onMenuStyle(item.getItemId());
-                return true;
             case R.id.menu_style_toolbar:
                 onMenuStyleToolbar();
                 return true;
+            case R.id.menu_image:
+                onActionImage();
+                return true;
+            case R.id.menu_attachment:
+                onActionAttachment();
+                return true;
+            case R.id.menu_clear:
+                onMenuStyle(item.getItemId());
+                return true;
             case R.id.menu_encrypt:
                 onMenuEncrypt();
                 return true;
@@ -819,6 +829,14 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
+    private void onMenuStyleToolbar() {
+        style = !style;
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        prefs.edit().putBoolean("style_toolbar", style).apply();
+        getActivity().invalidateOptionsMenu();
+        edit_bar.setVisibility(style ? View.VISIBLE : View.GONE);
+    }
+
     private void onMenuStyle(int id) {
         int s = etBody.getSelectionStart();
         int e = etBody.getSelectionEnd();
@@ -921,14 +939,6 @@ public class FragmentCompose extends FragmentBase {
         etBody.setSelection(end);
     }
 
-    private void onMenuStyleToolbar() {
-        style = !style;
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        prefs.edit().putBoolean("style_toolbar", style).apply();
-        getActivity().invalidateOptionsMenu();
-        edit_bar.setVisibility(style ? View.VISIBLE : View.GONE);
-    }
-
     private void onMenuEncrypt() {
         encrypt = !encrypt;
         getActivity().invalidateOptionsMenu();

app/src/main/res/menu/menu_compose.xml

@@ -13,17 +13,27 @@
         android:title="@string/title_zoom"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/menu_clear"
-        android:title="@string/title_style_clear"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_style_toolbar"
         android:checkable="true"
         android:title="@string/title_style_toolbar"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_image"
+        android:title="@string/title_style_image"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_attachment"
+        android:title="@string/title_add_attachment"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_clear"
+        android:title="@string/title_style_clear"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_encrypt"
         android:checkable="true"