From 02112393602bda5793ae60d737d8e210d8d2ead9 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Tue, 13 Jul 2021 14:42:16 +1000
Subject: [PATCH] add message info item in menu

---
 .../securesms/conversation/v2/ConversationActivityV2.kt   | 4 ++++
 .../v2/menus/ConversationActionModeCallback.kt            | 4 ++++
 app/src/main/res/menu/menu_conversation_item_action.xml   | 8 +++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 52178c4f26..2454f99687 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1228,6 +1228,10 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         endActionMode()
     }
 
+    override fun showMessageDetail(messages: Set<MessageRecord>) {
+        TODO("Not yet implemented")
+    }
+
     override fun saveAttachment(messages: Set<MessageRecord>) {
         val message = messages.first() as MmsMessageRecord
         SaveAttachmentTask.showWarningDialog(this, { _, _ ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 62f292e325..95c9f1e968 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -56,6 +56,8 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         // Copy Session ID
         menu.findItem(R.id.menu_context_copy_public_key).isVisible =
             (thread.isGroupRecipient && selectedItems.size == 1 && firstMessage.recipient.address.toString() != userPublicKey)
+        // Message detail
+        menu.findItem(R.id.menu_message_details).isVisible = (selectedItems.size == 1 && firstMessage.isFailed)
         // Resend
         menu.findItem(R.id.menu_context_resend).isVisible = (selectedItems.size == 1 && firstMessage.isFailed)
         // Save media
@@ -78,6 +80,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
             R.id.menu_context_copy -> delegate?.copyMessages(selectedItems)
             R.id.menu_context_copy_public_key -> delegate?.copySessionID(selectedItems)
             R.id.menu_context_resend -> delegate?.resendMessage(selectedItems)
+            R.id.menu_message_details -> delegate?.showMessageDetail(selectedItems)
             R.id.menu_context_save_attachment -> delegate?.saveAttachment(selectedItems)
             R.id.menu_context_reply -> delegate?.reply(selectedItems)
         }
@@ -97,6 +100,7 @@ interface ConversationActionModeCallbackDelegate {
     fun copyMessages(messages: Set<MessageRecord>)
     fun copySessionID(messages: Set<MessageRecord>)
     fun resendMessage(messages: Set<MessageRecord>)
+    fun showMessageDetail(messages: Set<MessageRecord>)
     fun saveAttachment(messages: Set<MessageRecord>)
     fun reply(messages: Set<MessageRecord>)
 }
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_conversation_item_action.xml b/app/src/main/res/menu/menu_conversation_item_action.xml
index ffa6fc7ed3..5581c2eb78 100644
--- a/app/src/main/res/menu/menu_conversation_item_action.xml
+++ b/app/src/main/res/menu/menu_conversation_item_action.xml
@@ -21,6 +21,12 @@
         android:icon="?menu_trash_icon"
         app:showAsAction="always" />
 
+    <item
+        android:title="@string/details"
+        android:id="@+id/menu_message_details"
+        android:icon="?menu_info_icon"
+        app:showAsAction="always" />
+
     <item
         android:title="@string/conversation_context__menu_copy_text"
         android:id="@+id/menu_context_copy"
@@ -38,7 +44,7 @@
         app:showAsAction="never" />
 
     <item
-        android:title="@string/activity_conversation_copy_public_key_button_title"
+        android:title="@string/activity_conversation_menu_copy_session_id"
         android:id="@+id/menu_context_copy_public_key"
         app:showAsAction="never" />