From 133effccfce215a2932b9ea069f533eefceb4e82 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 1 Sep 2023 10:30:09 -0300 Subject: [PATCH] Move delegate creation to a lazy field. --- .../conversation/v2/ConversationFragment.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 32a64b667b..58ad4841bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -522,7 +522,14 @@ class ConversationFragment : private val scheduledMessagesStub: Stub by lazy { Stub(binding.scheduledMessagesStub) } - private lateinit var reactionDelegate: ConversationReactionDelegate + private val reactionDelegate: ConversationReactionDelegate by lazy(LazyThreadSafetyMode.NONE) { + val conversationReactionStub = Stub(binding.conversationReactionScrubberStub) + val delegate = ConversationReactionDelegate(conversationReactionStub) + delegate.setOnReactionSelectedListener(OnReactionsSelectedListener()) + + delegate + } + private lateinit var voiceMessageRecordingDelegate: VoiceMessageRecordingDelegate //region Android Lifecycle @@ -952,10 +959,6 @@ class ConversationFragment : ) childFragmentManager.setFragmentResultListener(AttachmentKeyboardFragment.RESULT_KEY, viewLifecycleOwner, AttachmentKeyboardFragmentListener()) - - val conversationReactionStub = Stub(binding.conversationReactionScrubberStub) - reactionDelegate = ConversationReactionDelegate(conversationReactionStub) - reactionDelegate.setOnReactionSelectedListener(OnReactionsSelectedListener()) motionEventRelay.setDrain(MotionEventRelayDrain(this)) voiceMessageRecordingDelegate = VoiceMessageRecordingDelegate(