Merge branch 'trz/rename' into trz/rebase

Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index eb2688fd..70462d03 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -42,6 +42,8 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import de.thedevstack.conversationsplus.ui.dialogs.MessageDetailsDialog;
+import de.thedevstack.conversationsplus.ui.listeners.ConversationSwipeRefreshListener;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -500,6 +502,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	@Override
 	public boolean onContextItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
+			case R.id.msg_ctx_mnu_details:
+                new MessageDetailsDialog(getActivity(), selectedMessage).show();
+				return true;
 			case R.id.share_with:
 				shareWith(selectedMessage);
 				return true;