From 2816377e3410dc17f3a24f59800bb6eab673c24d Mon Sep 17 00:00:00 2001 From: charles Date: Fri, 4 Nov 2022 09:03:54 +1100 Subject: [PATCH] Attach delegate --- .../securesms/conversation/ConversationActionBarView.kt | 3 ++- .../securesms/conversation/v2/ConversationActivityV2.kt | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt index 89d292e906..b52f2e6bde 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt @@ -54,7 +54,8 @@ class ConversationActionBarView : LinearLayout { mediator.attach() } - fun bind(threadId: Long, recipient: Recipient, glide: GlideRequests) { + fun bind(threadId: Long, recipient: Recipient, glide: GlideRequests, delegate: ConversationActionBarDelegate) { + this.delegate = delegate binding.conversationTitleView.text = when { recipient.isLocalNumber -> context.getString(R.string.note_to_self) else -> recipient.toShortString() 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 2ff064941c..d7144004b8 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 @@ -87,7 +87,6 @@ import org.thoughtcrime.securesms.audio.AudioRecorder import org.thoughtcrime.securesms.contacts.SelectContactsActivity.Companion.selectedContactsKey import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher import org.thoughtcrime.securesms.conversation.ConversationActionBarDelegate -import org.thoughtcrime.securesms.conversation.ConversationSetting import org.thoughtcrime.securesms.conversation.expiration.ExpirationSettingsActivity import org.thoughtcrime.securesms.conversation.v2.ConversationReactionOverlay.OnActionSelectedListener import org.thoughtcrime.securesms.conversation.v2.ConversationReactionOverlay.OnReactionSelectedListener @@ -455,7 +454,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe actionBar.title = "" actionBar.setDisplayHomeAsUpEnabled(true) actionBar.setHomeButtonEnabled(true) - binding!!.toolbarContent.bind(viewModel.threadId, recipient, glide) + binding!!.toolbarContent.bind(viewModel.threadId, recipient, glide, this) } // called from onCreate