mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-19 00:01:08 +01:00
Fix unexpected keyboard appearance on repeated back swipe.
Resolves signalapp/Signal-Android#14618 Closes signalapp/Signal-Android#14633
This commit is contained in:
committed by
Cody Henthorne
parent
378ebb00c4
commit
5568a14490
@@ -34,7 +34,6 @@ import android.view.Menu
|
|||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import android.view.MotionEvent
|
import android.view.MotionEvent
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.View.OnFocusChangeListener
|
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.ViewTreeObserver
|
import android.view.ViewTreeObserver
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
@@ -457,7 +456,6 @@ class ConversationFragment :
|
|||||||
removeTextChangedListener(composeTextEventsListener)
|
removeTextChangedListener(composeTextEventsListener)
|
||||||
setStylingChangedListener(null)
|
setStylingChangedListener(null)
|
||||||
setOnClickListener(null)
|
setOnClickListener(null)
|
||||||
removeOnFocusChangeListener(composeTextEventsListener)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dataObserver?.let {
|
dataObserver?.let {
|
||||||
@@ -1229,7 +1227,6 @@ class ConversationFragment :
|
|||||||
addTextChangedListener(composeTextEventsListener)
|
addTextChangedListener(composeTextEventsListener)
|
||||||
setStylingChangedListener(composeTextEventsListener)
|
setStylingChangedListener(composeTextEventsListener)
|
||||||
setOnClickListener(composeTextEventsListener)
|
setOnClickListener(composeTextEventsListener)
|
||||||
onFocusChangeListener = composeTextEventsListener
|
|
||||||
filters += ByteLimitInputFilter(MessageUtil.MAX_TOTAL_BODY_SIZE_BYTES)
|
filters += ByteLimitInputFilter(MessageUtil.MAX_TOTAL_BODY_SIZE_BYTES)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1410,7 +1407,7 @@ class ConversationFragment :
|
|||||||
viewLifecycleOwner.lifecycle.addObserver(conversationUpdateTick)
|
viewLifecycleOwner.lifecycle.addObserver(conversationUpdateTick)
|
||||||
|
|
||||||
if (args.conversationScreenType.isInPopup) {
|
if (args.conversationScreenType.isInPopup) {
|
||||||
composeText.requestFocus()
|
container.showSoftkey(composeText)
|
||||||
binding.conversationInputPanel.quickAttachmentToggle.disable()
|
binding.conversationInputPanel.quickAttachmentToggle.disable()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4667,7 +4664,6 @@ class ConversationFragment :
|
|||||||
View.OnKeyListener,
|
View.OnKeyListener,
|
||||||
View.OnClickListener,
|
View.OnClickListener,
|
||||||
TextWatcher,
|
TextWatcher,
|
||||||
OnFocusChangeListener,
|
|
||||||
ComposeText.CursorPositionChangedListener,
|
ComposeText.CursorPositionChangedListener,
|
||||||
ComposeText.StylingChangedListener {
|
ComposeText.StylingChangedListener {
|
||||||
|
|
||||||
@@ -4713,12 +4709,6 @@ class ConversationFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onFocusChange(v: View, hasFocus: Boolean) {
|
|
||||||
if (hasFocus) { // && container.getCurrentInput() == emojiDrawerStub.get()) {
|
|
||||||
container.showSoftkey(composeText)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCursorPositionChanged(start: Int, end: Int) {
|
override fun onCursorPositionChanged(start: Int, end: Int) {
|
||||||
linkPreviewViewModel.onTextChanged(composeText.textTrimmed.toString(), start, end)
|
linkPreviewViewModel.onTextChanged(composeText.textTrimmed.toString(), start, end)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user