From 99f70e5c216b110a62993bd8fdd8c5ec7dd5e52e Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Mon, 3 Oct 2022 13:42:47 +1100
Subject: [PATCH] Move open group query into click handler

---
 .../securesms/conversation/v2/messages/VisibleMessageView.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 0507394dbd..834f00ca98 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -153,12 +153,12 @@ class VisibleMessageView : LinearLayout {
 
         if (isGroupThread && !message.isOutgoing) {
             if (isEndOfMessageCluster) {
-                val openGroup = lokiThreadDb.getOpenGroupChat(threadID)
                 binding.profilePictureView.root.publicKey = senderSessionID
                 binding.profilePictureView.root.glide = glide
                 binding.profilePictureView.root.update(message.individualRecipient)
                 binding.profilePictureView.root.setOnClickListener {
                     if (thread.isOpenGroupRecipient) {
+                        val openGroup = lokiThreadDb.getOpenGroupChat(threadID)
                         if (IdPrefix.fromValue(senderSessionID) == IdPrefix.BLINDED && openGroup?.canWrite == true) {
                             val intent = Intent(context, ConversationActivityV2::class.java)
                             intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID)
@@ -170,7 +170,7 @@ class VisibleMessageView : LinearLayout {
                     }
                 }
                 if (thread.isOpenGroupRecipient) {
-                    openGroup ?: return
+                    val openGroup = lokiThreadDb.getOpenGroupChat(threadID) ?: return
                     var standardPublicKey = ""
                     var blindedPublicKey: String? = null
                     if (IdPrefix.fromValue(senderSessionID) == IdPrefix.BLINDED) {