From 266ed2fa78d696c6bcf039ff54333f5debd41334 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:50:35 +1000
Subject: [PATCH] feat: allow opening conversation thread from
 UserDetailsBottomSheet.kt

refactor the copy button logic to occur when long pressing the Session ID text to fix #517
---
 .../securesms/home/UserDetailsBottomSheet.kt    | 17 ++++++++++++++++-
 .../fragment_user_details_bottom_sheet.xml      |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
index f6010bb53d..f13c2824d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,9 +15,11 @@ import android.widget.Toast
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.util.UiModeUtilities
@@ -63,11 +66,23 @@ class UserDetailsBottomSheet : BottomSheetDialogFragment() {
         }
         nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
         publicKeyTextView.text = publicKey
-        copyButton.setOnClickListener {
+        publicKeyTextView.setOnLongClickListener {
             val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText("Session ID", publicKey)
             clipboard.setPrimaryClip(clip)
             Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+            true
+        }
+        messageButton.setOnClickListener {
+            val threadId = MessagingModuleConfiguration.shared.storage.getThreadId(recipient)
+            val intent = Intent(
+                context,
+                ConversationActivityV2::class.java
+            )
+            intent.putExtra(ConversationActivityV2.ADDRESS, recipient.address)
+            intent.putExtra(ConversationActivityV2.THREAD_ID, threadId ?: -1)
+            startActivity(intent)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 985de78a64..4b46e134cd 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -111,12 +111,12 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
-        android:id="@+id/copyButton"
+        android:id="@+id/messageButton"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginTop="@dimen/medium_spacing"
         android:paddingLeft="@dimen/large_spacing"
         android:paddingRight="@dimen/large_spacing"
-        android:text="@string/copy" />
+        android:text="@string/ConversationActivity_message" />
 
 </LinearLayout>