Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 02:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when leaving conversation.

Browse Source
This commit is contained in:
Cody Henthorne
2023-07-20 13:52:12 -04:00
parent ec25831a37
commit b887129cd7
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
View File

@@ -90,6 +90,12 @@ public class EmojiEditText extends AppCompatEditText {
onFocusChangeListeners.add(listener);
}
public void removeOnFocusChangeListener(@Nullable OnFocusChangeListener listener) {
if (listener != null) {
onFocusChangeListeners.remove(listener);
}
}
private InputFilter[] appendEmojiFilter(@Nullable InputFilter[] originalFilters, boolean jumboEmoji) {
InputFilter[] result;

16
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -356,7 +356,18 @@ class ConversationFragment :
}
private val disposables = LifecycleDisposable()
private val binding by ViewBinderDelegate(V2ConversationFragmentBinding::bind)
private val binding by ViewBinderDelegate(V2ConversationFragmentBinding::bind) {
composeText.apply {
setOnEditorActionListener(null)
setCursorPositionChangedListener(null)
setOnKeyListener(null)
removeTextChangedListener(composeTextEventsListener)
setStylingChangedListener(null)
setOnClickListener(null)
removeOnFocusChangeListener(composeTextEventsListener)
}
}
private val viewModel: ConversationViewModel by viewModel {
ConversationViewModel(
threadId = args.threadId,
@@ -454,6 +465,7 @@ class ConversationFragment :
private var isSearchRequested: Boolean = false
private var previousPages: Set<KeyboardPage>? = null
private var reShowScheduleMessagesBar: Boolean = false
private var composeTextEventsListener: ComposeTextEventsListener? = null
private val jumpAndPulseScrollStrategy = object : ScrollToPositionDelegate.ScrollStrategy {
override fun performScroll(recyclerView: RecyclerView, layoutManager: LinearLayoutManager, position: Int, smooth: Boolean) {
@@ -814,7 +826,7 @@ class ConversationFragment :
binding.conversationDisabledInput.listener = disabledInputListener
val sendButtonListener = SendButtonListener()
val composeTextEventsListener = ComposeTextEventsListener()
composeTextEventsListener = ComposeTextEventsListener()
composeText.apply {
setOnEditorActionListener(sendButtonListener)