do not use pop up menus for encryption and attachment selection

src/main/java/eu/siacs/conversations/ui/ConversationActivity.java

@@ -114,6 +114,9 @@ public class ConversationActivity extends XmppActivity
 
 	private boolean conversationWasSelectedByKeyboard = false;
 
+	private boolean showSoundRecorderAttachment = false;
+	private boolean showLocationAttachment = false;
+
 	private View mContentView;
 
 	private List<Conversation> conversationList = new ArrayList<>();
@@ -345,12 +348,9 @@ public class ConversationActivity extends XmppActivity
 	@Override
 	public void switchToConversation(Conversation conversation) {
 		setSelectedConversation(conversation);
-		runOnUiThread(new Runnable() {
+		runOnUiThread(() -> {
-			@Override
+			ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-			public void run() {
+			openConversation();
-				ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				openConversation();
-			}
 		});
 	}
 
@@ -410,6 +410,8 @@ public class ConversationActivity extends XmppActivity
 		final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
 		final MenuItem menuMute = menu.findItem(R.id.action_mute);
 		final MenuItem menuUnmute = menu.findItem(R.id.action_unmute);
+		final MenuItem menuAttachSoundRecorder = menu.findItem(R.id.attach_record_voice);
+		final MenuItem menuAttachLocation = menu.findItem(R.id.attach_location);
 
 		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
 			menuArchive.setVisible(false);
@@ -443,109 +445,101 @@ public class ConversationActivity extends XmppActivity
 				} else {
 					menuUnmute.setVisible(false);
 				}
+				menuAttachLocation.setVisible(showLocationAttachment);
+				menuAttachSoundRecorder.setVisible(showSoundRecorderAttachment);
+				configureEncryptionMenu(getSelectedConversation(),menu);
 			}
 		}
-		if (Config.supportOmemo()) {
-			new Handler().post(addOmemoDebuggerRunnable);
-		}
 		return super.onCreateOptionsMenu(menu);
 	}
 
-	private Runnable addOmemoDebuggerRunnable = new Runnable() {
+	private static void configureEncryptionMenu(Conversation conversation, Menu menu) {
-		@Override
+		MenuItem otr = menu.findItem(R.id.encryption_choice_otr);
-		public void run() {
+		MenuItem none = menu.findItem(R.id.encryption_choice_none);
-			View view = findViewById(R.id.action_security);
+		MenuItem pgp = menu.findItem(R.id.encryption_choice_pgp);
-			if (view != null) {
+		MenuItem axolotl = menu.findItem(R.id.encryption_choice_axolotl);
-				view.setOnLongClickListener(new View.OnLongClickListener() {
+		pgp.setVisible(Config.supportOpenPgp());
-					@Override
+		none.setVisible(Config.supportUnencrypted() || conversation.getMode() == Conversation.MODE_MULTI);
-					public boolean onLongClick(View v) {
+		otr.setVisible(Config.supportOtr());
-						return v.getId() == R.id.action_security && quickOmemoDebugger(getSelectedConversation());
+		axolotl.setVisible(Config.supportOmemo());
-					}
+		if (conversation.getMode() == Conversation.MODE_MULTI) {
-				});
+			otr.setVisible(false);
-			}
 		}
-	};
+		if (!conversation.getAccount().getAxolotlService().isConversationAxolotlCapable(conversation)) {
-
+			axolotl.setEnabled(false);
-	private boolean quickOmemoDebugger(Conversation c) {
+		}
-		if (c != null) {
+		switch (conversation.getNextEncryption()) {
-			boolean single = c.getMode() == Conversation.MODE_SINGLE;
+			case Message.ENCRYPTION_NONE:
-			AxolotlService axolotlService = c.getAccount().getAxolotlService();
+				none.setChecked(true);
-			Pair<AxolotlService.AxolotlCapability,Jid> capabilityJidPair = axolotlService.isConversationAxolotlCapableDetailed(c);
+				break;
-			switch (capabilityJidPair.first) {
+			case Message.ENCRYPTION_OTR:
-				case MISSING_PRESENCE:
+				otr.setChecked(true);
-					Toast.makeText(ConversationActivity.this,single ? getString(R.string.missing_presence_subscription) : getString(R.string.missing_presence_subscription_with_x,capabilityJidPair.second.toBareJid().toString()),Toast.LENGTH_SHORT).show();
+				break;
-					return true;
+			case Message.ENCRYPTION_PGP:
-				case MISSING_KEYS:
+				pgp.setChecked(true);
-					Toast.makeText(ConversationActivity.this,single ? getString(R.string.missing_omemo_keys) : getString(R.string.missing_keys_from_x,capabilityJidPair.second.toBareJid().toString()),Toast.LENGTH_SHORT).show();
+				break;
-					return true;
+			case Message.ENCRYPTION_AXOLOTL:
-				case WRONG_CONFIGURATION:
+				axolotl.setChecked(true);
-					Toast.makeText(ConversationActivity.this,R.string.wrong_conference_configuration, Toast.LENGTH_SHORT).show();
+				break;
-					return true;
+			default:
-				case NO_MEMBERS:
+				none.setChecked(true);
-					Toast.makeText(ConversationActivity.this,R.string.this_conference_has_no_members, Toast.LENGTH_SHORT).show();
+				break;
-					return true;
-			}
 		}
-		return false;
 	}
 
 	protected void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) {
 		final Conversation conversation = getSelectedConversation();
 		final Account account = conversation.getAccount();
-		final OnPresenceSelected callback = new OnPresenceSelected() {
+		final OnPresenceSelected callback = () -> {
-
+			Intent intent = new Intent();
-			@Override
+			boolean chooser = false;
-			public void onPresenceSelected() {
+			String fallbackPackageId = null;
-				Intent intent = new Intent();
+			switch (attachmentChoice) {
-				boolean chooser = false;
+				case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
-				String fallbackPackageId = null;
+					intent.setAction(Intent.ACTION_GET_CONTENT);
-				switch (attachmentChoice) {
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-					case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
+						intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-						intent.setAction(Intent.ACTION_GET_CONTENT);
-						if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-							intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-						}
-						intent.setType("image/*");
-						chooser = true;
-						break;
-					case ATTACHMENT_CHOICE_RECORD_VIDEO:
-						intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE);
-						break;
-					case ATTACHMENT_CHOICE_TAKE_PHOTO:
-						Uri uri = xmppConnectionService.getFileBackend().getTakePhotoUri();
-						mPendingImageUris.clear();
-						mPendingImageUris.add(uri);
-						intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-						intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-						intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-						intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-						break;
-					case ATTACHMENT_CHOICE_CHOOSE_FILE:
-						chooser = true;
-						intent.setType("*/*");
-						intent.addCategory(Intent.CATEGORY_OPENABLE);
-						intent.setAction(Intent.ACTION_GET_CONTENT);
-						break;
-					case ATTACHMENT_CHOICE_RECORD_VOICE:
-						intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
-						fallbackPackageId = "eu.siacs.conversations.voicerecorder";
-						break;
-					case ATTACHMENT_CHOICE_LOCATION:
-						intent.setAction("eu.siacs.conversations.location.request");
-						fallbackPackageId = "eu.siacs.conversations.sharelocation";
-						break;
-				}
-				if (intent.resolveActivity(getPackageManager()) != null) {
-					if (chooser) {
-						startActivityForResult(
-								Intent.createChooser(intent, getString(R.string.perform_action_with)),
-								attachmentChoice);
-					} else {
-						startActivityForResult(intent, attachmentChoice);
 					}
-				} else if (fallbackPackageId != null) {
+					intent.setType("image/*");
-					startActivity(getInstallApkIntent(fallbackPackageId));
+					chooser = true;
+					break;
+				case ATTACHMENT_CHOICE_RECORD_VIDEO:
+					intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE);
+					break;
+				case ATTACHMENT_CHOICE_TAKE_PHOTO:
+					Uri uri = xmppConnectionService.getFileBackend().getTakePhotoUri();
+					mPendingImageUris.clear();
+					mPendingImageUris.add(uri);
+					intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+					intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+					intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+					intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+					break;
+				case ATTACHMENT_CHOICE_CHOOSE_FILE:
+					chooser = true;
+					intent.setType("*/*");
+					intent.addCategory(Intent.CATEGORY_OPENABLE);
+					intent.setAction(Intent.ACTION_GET_CONTENT);
+					break;
+				case ATTACHMENT_CHOICE_RECORD_VOICE:
+					intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
+					fallbackPackageId = "eu.siacs.conversations.voicerecorder";
+					break;
+				case ATTACHMENT_CHOICE_LOCATION:
+					intent.setAction("eu.siacs.conversations.location.request");
+					fallbackPackageId = "eu.siacs.conversations.sharelocation";
+					break;
+			}
+			if (intent.resolveActivity(getPackageManager()) != null) {
+				if (chooser) {
+					startActivityForResult(
+							Intent.createChooser(intent, getString(R.string.perform_action_with)),
+							attachmentChoice);
+				} else {
+					startActivityForResult(intent, attachmentChoice);
 				}
+			} else if (fallbackPackageId != null) {
+				startActivity(getInstallApkIntent(fallbackPackageId));
 			}
 		};
 		if ((account.httpUploadAvailable() || attachmentChoice == ATTACHMENT_CHOICE_LOCATION) && encryption != Message.ENCRYPTION_OTR) {
@@ -704,8 +698,29 @@ public class ConversationActivity extends XmppActivity
 			return true;
 		} else if (getSelectedConversation() != null) {
 			switch (item.getItemId()) {
-				case R.id.action_attach_file:
+				case R.id.encryption_choice_axolotl:
-					attachFileDialog();
+				case R.id.encryption_choice_otr:
+				case R.id.encryption_choice_pgp:
+				case R.id.encryption_choice_none:
+					handleEncryptionSelection(item);
+					break;
+				case R.id.attach_choose_picture:
+					attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
+					break;
+				case R.id.attach_take_picture:
+					attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
+					break;
+				case R.id.attach_record_video:
+					attachFile(ATTACHMENT_CHOICE_RECORD_VIDEO);
+					break;
+				case R.id.attach_choose_file:
+					attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
+					break;
+				case R.id.attach_record_voice:
+					attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
+					break;
+				case R.id.attach_location:
+					attachFile(ATTACHMENT_CHOICE_LOCATION);
 					break;
 				case R.id.action_archive:
 					this.endConversation(getSelectedConversation());
@@ -723,9 +738,6 @@ public class ConversationActivity extends XmppActivity
 				case R.id.action_invite:
 					inviteToConversation(getSelectedConversation());
 					break;
-				case R.id.action_security:
-					selectEncryptionDialog(getSelectedConversation());
-					break;
 				case R.id.action_clear_history:
 					clearHistoryDialog(getSelectedConversation());
 					break;
@@ -779,73 +791,23 @@ public class ConversationActivity extends XmppActivity
 	protected void clearHistoryDialog(final Conversation conversation) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(getString(R.string.clear_conversation_history));
-		View dialogView = getLayoutInflater().inflate(
+		final View dialogView = getLayoutInflater().inflate(R.layout.dialog_clear_history, null);
-				R.layout.dialog_clear_history, null);
+		final CheckBox endConversationCheckBox = dialogView.findViewById(R.id.end_conversation_checkbox);
-		final CheckBox endConversationCheckBox = (CheckBox) dialogView
-				.findViewById(R.id.end_conversation_checkbox);
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
-				new OnClickListener() {
+				(dialog, which) -> {
-
+					ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-					@Override
+					if (endConversationCheckBox.isChecked()) {
-					public void onClick(DialogInterface dialog, int which) {
+						endConversation(conversation);
-						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
+					} else {
-						if (endConversationCheckBox.isChecked()) {
+						updateConversationList();
-							endConversation(conversation);
+						ConversationActivity.this.mConversationFragment.updateMessages();
-						} else {
-							updateConversationList();
-							ConversationActivity.this.mConversationFragment.updateMessages();
-						}
 					}
 				});
 		builder.create().show();
 	}
 
-	protected void attachFileDialog() {
-		View menuAttachFile = findViewById(R.id.action_attach_file);
-		if (menuAttachFile == null) {
-			return;
-		}
-		PopupMenu attachFilePopup = new PopupMenu(this, menuAttachFile);
-		attachFilePopup.inflate(R.menu.attachment_choices);
-		if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) {
-			attachFilePopup.getMenu().findItem(R.id.attach_record_voice).setVisible(false);
-		}
-		if (new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null) {
-			attachFilePopup.getMenu().findItem(R.id.attach_location).setVisible(false);
-		}
-		attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-
-			@Override
-			public boolean onMenuItemClick(MenuItem item) {
-				switch (item.getItemId()) {
-					case R.id.attach_choose_picture:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
-						break;
-					case R.id.attach_take_picture:
-						attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
-						break;
-					case R.id.attach_record_video:
-						attachFile(ATTACHMENT_CHOICE_RECORD_VIDEO);
-						break;
-					case R.id.attach_choose_file:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
-						break;
-					case R.id.attach_record_voice:
-						attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
-						break;
-					case R.id.attach_location:
-						attachFile(ATTACHMENT_CHOICE_LOCATION);
-						break;
-				}
-				return false;
-			}
-		});
-		UIHelper.showIconsInPopup(attachFilePopup);
-		attachFilePopup.show();
-	}
-
 	public void verifyOtrSessionDialog(final Conversation conversation, View view) {
 		if (!conversation.hasValidOtrSession() || conversation.getOtrSession().getSessionStatus() != SessionStatus.ENCRYPTED) {
 			Toast.makeText(this, R.string.otr_session_not_started, Toast.LENGTH_LONG).show();
@@ -881,91 +843,47 @@ public class ConversationActivity extends XmppActivity
 		popup.show();
 	}
 
-	protected void selectEncryptionDialog(final Conversation conversation) {
+	private void handleEncryptionSelection(MenuItem item) {
-		View menuItemView = findViewById(R.id.action_security);
+		Conversation conversation = getSelectedConversation();
-		if (menuItemView == null) {
+		if (conversation == null) {
 			return;
 		}
-		PopupMenu popup = new PopupMenu(this, menuItemView);
+		final ConversationFragment fragment = (ConversationFragment) getFragmentManager().findFragmentByTag("conversation");
-		final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
+		switch (item.getItemId()) {
-				.findFragmentByTag("conversation");
+			case R.id.encryption_choice_none:
-		if (fragment != null) {
+				conversation.setNextEncryption(Message.ENCRYPTION_NONE);
-			popup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+				item.setChecked(true);
-
+				break;
-				@Override
+			case R.id.encryption_choice_otr:
-				public boolean onMenuItemClick(MenuItem item) {
+				conversation.setNextEncryption(Message.ENCRYPTION_OTR);
-					switch (item.getItemId()) {
+				item.setChecked(true);
-						case R.id.encryption_choice_none:
+				break;
-							conversation.setNextEncryption(Message.ENCRYPTION_NONE);
+			case R.id.encryption_choice_pgp:
-							item.setChecked(true);
+				if (hasPgp()) {
-							break;
+					if (conversation.getAccount().getPgpSignature() != null) {
-						case R.id.encryption_choice_otr:
+						conversation.setNextEncryption(Message.ENCRYPTION_PGP);
-							conversation.setNextEncryption(Message.ENCRYPTION_OTR);
+						item.setChecked(true);
-							item.setChecked(true);
+					} else {
-							break;
+						announcePgp(conversation.getAccount(), conversation,null, onOpenPGPKeyPublished);
-						case R.id.encryption_choice_pgp:
-							if (hasPgp()) {
-								if (conversation.getAccount().getPgpSignature() != null) {
-									conversation.setNextEncryption(Message.ENCRYPTION_PGP);
-									item.setChecked(true);
-								} else {
-									announcePgp(conversation.getAccount(), conversation,null, onOpenPGPKeyPublished);
-								}
-							} else {
-								showInstallPgpDialog();
-							}
-							break;
-						case R.id.encryption_choice_axolotl:
-							Log.d(Config.LOGTAG, AxolotlService.getLogprefix(conversation.getAccount())
-									+ "Enabled axolotl for Contact " + conversation.getContact().getJid());
-							conversation.setNextEncryption(Message.ENCRYPTION_AXOLOTL);
-							item.setChecked(true);
-							break;
-						default:
-							conversation.setNextEncryption(Message.ENCRYPTION_NONE);
-							break;
 					}
-					xmppConnectionService.updateConversation(conversation);
+				} else {
-					fragment.updateChatMsgHint();
+					showInstallPgpDialog();
-					invalidateOptionsMenu();
-					refreshUi();
-					return true;
 				}
-			});
+				break;
-			popup.inflate(R.menu.encryption_choices);
+			case R.id.encryption_choice_axolotl:
-			MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr);
+				Log.d(Config.LOGTAG, AxolotlService.getLogprefix(conversation.getAccount())
-			MenuItem none = popup.getMenu().findItem(R.id.encryption_choice_none);
+						+ "Enabled axolotl for Contact " + conversation.getContact().getJid());
-			MenuItem pgp = popup.getMenu().findItem(R.id.encryption_choice_pgp);
+				conversation.setNextEncryption(Message.ENCRYPTION_AXOLOTL);
-			MenuItem axolotl = popup.getMenu().findItem(R.id.encryption_choice_axolotl);
+				item.setChecked(true);
-			pgp.setVisible(Config.supportOpenPgp());
+				break;
-			none.setVisible(Config.supportUnencrypted() || conversation.getMode() == Conversation.MODE_MULTI);
+			default:
-			otr.setVisible(Config.supportOtr());
+				conversation.setNextEncryption(Message.ENCRYPTION_NONE);
-			axolotl.setVisible(Config.supportOmemo());
+				break;
-			if (conversation.getMode() == Conversation.MODE_MULTI) {
-				otr.setVisible(false);
-			}
-			if (!conversation.getAccount().getAxolotlService().isConversationAxolotlCapable(conversation)) {
-				axolotl.setEnabled(false);
-			}
-			switch (conversation.getNextEncryption()) {
-				case Message.ENCRYPTION_NONE:
-					none.setChecked(true);
-					break;
-				case Message.ENCRYPTION_OTR:
-					otr.setChecked(true);
-					break;
-				case Message.ENCRYPTION_PGP:
-					pgp.setChecked(true);
-					break;
-				case Message.ENCRYPTION_AXOLOTL:
-					axolotl.setChecked(true);
-					break;
-				default:
-					none.setChecked(true);
-					break;
-			}
-			popup.show();
 		}
+		xmppConnectionService.updateConversation(conversation);
+		fragment.updateChatMsgHint();
+		invalidateOptionsMenu();
+		refreshUi();
 	}
 
 	protected void muteConversationDialog(final Conversation conversation) {
@@ -1165,12 +1083,14 @@ public class ConversationActivity extends XmppActivity
 			recreate();
 		}
 		this.mActivityPaused = false;
-
-
 		if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
 			sendReadMarkerIfNecessary(getSelectedConversation());
 		}
-
+		new Handler().post(() -> {
+			showSoundRecorderAttachment = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) != null;
+			showLocationAttachment = new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) != null;
+			invalidateOptionsMenu();
+		});
 	}
 
 	@Override

src/main/java/eu/siacs/conversations/utils/UIHelper.java

@@ -551,19 +551,4 @@ public class UIHelper {
 				return type;
 		}
 	}
-
-	public static boolean showIconsInPopup(PopupMenu attachFilePopup) {
-		try {
-			Field field = attachFilePopup.getClass().getDeclaredField("mPopup");
-			field.setAccessible(true);
-			Object menuPopupHelper = field.get(attachFilePopup);
-			Class<?> cls = Class.forName("com.android.internal.view.menu.MenuPopupHelper");
-			Method method = cls.getDeclaredMethod("setForceShowIcon", new Class[]{boolean.class});
-			method.setAccessible(true);
-			method.invoke(menuPopupHelper, new Object[]{true});
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
 }

src/main/res/menu/attachment_choices.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/attach_choose_file"
-        android:title="@string/choose_file"
-        android:icon="?attr/ic_attach_document"/>
-
-    <item
-        android:id="@+id/attach_choose_picture"
-        android:title="@string/attach_choose_picture"
-        android:icon="?attr/ic_attach_photo"/>
-
-    <item
-        android:id="@+id/attach_take_picture"
-        android:title="@string/attach_take_picture"
-        android:icon="?attr/ic_attach_camera"/>
-
-    <item
-        android:id="@+id/attach_record_video"
-        android:title="@string/attach_record_video"
-        android:icon="?attr/ic_attach_videocam"/>
-
-    <item
-        android:id="@+id/attach_record_voice"
-        android:title="@string/attach_record_voice"
-        android:icon="?attr/ic_attach_record"/>
-
-    <item
-        android:id="@+id/attach_location"
-        android:title="@string/send_location"
-        android:icon="?attr/ic_attach_location"/>
-
-</menu>

src/main/res/menu/conversations.xml

@@ -12,13 +12,63 @@
         android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         app:showAsAction="always"
-        android:title="@string/action_secure"/>
+        android:title="@string/action_secure">
+        <menu>
+            <group android:checkableBehavior="single" >
+                <item
+                    android:id="@+id/encryption_choice_none"
+                    android:title="@string/encryption_choice_unencrypted"/>
+                <item
+                    android:id="@+id/encryption_choice_axolotl"
+                    android:title="@string/encryption_choice_omemo"/>
+                <item
+                    android:id="@+id/encryption_choice_otr"
+                    android:title="@string/encryption_choice_otr"/>
+                <item
+                    android:id="@+id/encryption_choice_pgp"
+                    android:title="@string/encryption_choice_pgp"/>
+            </group>
+        </menu>
+    </item>
     <item
         android:id="@+id/action_attach_file"
         android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         app:showAsAction="always"
-        android:title="@string/attach_file"/>
+        android:title="@string/attach_file">
+        <menu>
+
+            <item
+                android:id="@+id/attach_choose_file"
+                android:title="@string/choose_file"
+                android:icon="?attr/ic_attach_document"/>
+
+            <item
+                android:id="@+id/attach_choose_picture"
+                android:title="@string/attach_choose_picture"
+                android:icon="?attr/ic_attach_photo"/>
+
+            <item
+                android:id="@+id/attach_take_picture"
+                android:title="@string/attach_take_picture"
+                android:icon="?attr/ic_attach_camera"/>
+
+            <item
+                android:id="@+id/attach_record_video"
+                android:title="@string/attach_record_video"
+                android:icon="?attr/ic_attach_videocam"/>
+
+            <item
+                android:id="@+id/attach_record_voice"
+                android:title="@string/attach_record_voice"
+                android:icon="?attr/ic_attach_record"/>
+
+            <item
+                android:id="@+id/attach_location"
+                android:title="@string/send_location"
+                android:icon="?attr/ic_attach_location"/>
+        </menu>
+    </item>
     <item
         android:id="@+id/action_contact_details"
         android:orderInCategory="40"

src/main/res/menu/encryption_choices.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <group android:checkableBehavior="single" >
-        <item
-            android:id="@+id/encryption_choice_none"
-            android:title="@string/encryption_choice_unencrypted"/>
-        <item
-            android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_omemo"/>
-        <item
-            android:id="@+id/encryption_choice_otr"
-            android:title="@string/encryption_choice_otr"/>
-        <item
-            android:id="@+id/encryption_choice_pgp"
-            android:title="@string/encryption_choice_pgp"/>
-    </group>
-
-</menu>