empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix various lifecycle crashes.

Browse source
This commit is contained in:
Cody Henthorne 2023-07-26 13:51:19 -04:00
parent 72d1e55373
commit 82e7050864
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file

@ -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

6
app/src/main/java/org/thoughtcrime/securesms/util/ViewModelFactory.kt
View file

@ -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)
}