From 82e70508649d6a88196830d15b8f0f562f8dfacd Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 26 Jul 2023 13:51:19 -0400
Subject: [PATCH] Fix various lifecycle crashes.

---
 .../conversation/v2/ConversationFragment.kt   | 20 ++++++++++---------
 .../securesms/util/ViewModelFactory.kt        |  6 ++++++
 2 files changed, 17 insertions(+), 9 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 8aa5ae6f5f..2c46c12956 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
@@ -294,8 +294,8 @@ import org.thoughtcrime.securesms.util.StorageUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.WindowUtil
-import org.thoughtcrime.securesms.util.activityViewModel
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture
+import org.thoughtcrime.securesms.util.createActivityViewModel
 import org.thoughtcrime.securesms.util.doAfterNextLayout
 import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.getRecordQuoteType
@@ -355,8 +355,8 @@ class ConversationFragment :
   }
 
   private val disposables = LifecycleDisposable()
-  private val binding by ViewBinderDelegate(V2ConversationFragmentBinding::bind) {
-    composeText.apply {
+  private val binding by ViewBinderDelegate(V2ConversationFragmentBinding::bind) { _binding ->
+    _binding.conversationInputPanel.embeddedTextEditor.apply {
       setOnEditorActionListener(null)
       setCursorPositionChangedListener(null)
       setOnKeyListener(null)
@@ -366,7 +366,9 @@ class ConversationFragment :
       removeOnFocusChangeListener(composeTextEventsListener)
     }
 
-    adapter.unregisterAdapterDataObserver(dataObserver)
+    dataObserver?.let {
+      adapter.unregisterAdapterDataObserver(it)
+    }
 
     textDraftSaveDebouncer.clear()
   }
@@ -416,9 +418,7 @@ class ConversationFragment :
     StickerSuggestionsViewModel()
   }
 
-  private val inlineQueryViewModel: InlineQueryViewModelV2 by activityViewModel {
-    InlineQueryViewModelV2(recipientRepository = conversationRecipientRepository)
-  }
+  private lateinit var inlineQueryViewModel: InlineQueryViewModelV2
 
   private val shareDataTimestampViewModel: ShareDataTimestampViewModel by activityViewModels()
 
@@ -458,7 +458,6 @@ class ConversationFragment :
   private lateinit var menuProvider: ConversationOptionsMenu.Provider
   private lateinit var typingIndicatorDecoration: TypingIndicatorDecoration
   private lateinit var backPressedCallback: BackPressedDelegate
-  private lateinit var dataObserver: DataObserver
 
   private var animationsAllowed = false
   private var actionMode: ActionMode? = null
@@ -468,6 +467,7 @@ class ConversationFragment :
   private var previousPages: Set<KeyboardPage>? = null
   private var reShowScheduleMessagesBar: Boolean = false
   private var composeTextEventsListener: ComposeTextEventsListener? = null
+  private var dataObserver: DataObserver? = null
 
   private val jumpAndPulseScrollStrategy = object : ScrollToPositionDelegate.ScrollStrategy {
     override fun performScroll(recyclerView: RecyclerView, layoutManager: LinearLayoutManager, position: Int, smooth: Boolean) {
@@ -521,6 +521,8 @@ class ConversationFragment :
     markReadHelper = MarkReadHelper(ConversationId.forConversation(args.threadId), requireContext(), viewLifecycleOwner)
     markReadHelper.ignoreViewReveals()
 
+    inlineQueryViewModel = createActivityViewModel { InlineQueryViewModelV2(recipientRepository = conversationRecipientRepository) }
+
     initializeConversationThreadUi()
 
     val conversationToolbarOnScrollHelper = ConversationToolbarOnScrollHelper(
@@ -868,7 +870,7 @@ class ConversationFragment :
     }
 
     dataObserver = DataObserver()
-    adapter.registerAdapterDataObserver(dataObserver)
+    adapter.registerAdapterDataObserver(dataObserver!!)
 
     val keyboardEvents = KeyboardEvents()
     container.listener = keyboardEvents
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewModelFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewModelFactory.kt
index 19e5e65590..328eaf88f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewModelFactory.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewModelFactory.kt
@@ -45,3 +45,9 @@ inline fun <reified VM : ViewModel> Fragment.activityViewModel(
     factoryProducer = ViewModelFactory.factoryProducer(create)
   )
 }
+
+@Suppress("ReplaceGetOrSet")
+@MainThread
+inline fun <reified VM : ViewModel> Fragment.createActivityViewModel(noinline create: () -> VM): VM {
+  return ViewModelProvider(requireActivity().viewModelStore, ViewModelFactory { create() }).get(VM::class.java)
+}