forked from upstream-mirrors/quik
small changes to GestureDectector usage to fix a race condition on motionEvents being used after they've been recycled
This commit is contained in:
@@ -98,15 +98,15 @@ fun View.forwardTouches(parent: View) {
|
|||||||
parent.onTouchEvent(e)
|
parent.onTouchEvent(e)
|
||||||
if (lastUpEvent !== null) {
|
if (lastUpEvent !== null) {
|
||||||
parent.onTouchEvent(lastUpEvent)
|
parent.onTouchEvent(lastUpEvent)
|
||||||
|
lastUpEvent?.recycle()
|
||||||
lastUpEvent = null
|
lastUpEvent = null
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSingleTapUp(e: MotionEvent): Boolean {
|
override fun onSingleTapUp(e: MotionEvent): Boolean {
|
||||||
onTouchEvent(e)
|
onTouchEvent(e)
|
||||||
lastUpEvent = e
|
lastUpEvent = MotionEvent.obtain(e)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -183,6 +183,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
|||||||
message.setOnTouchListener(object : OnTouchListener {
|
message.setOnTouchListener(object : OnTouchListener {
|
||||||
private val gestureDetector =
|
private val gestureDetector =
|
||||||
GestureDetector(this@ComposeActivity, object : SimpleOnGestureListener() {
|
GestureDetector(this@ComposeActivity, object : SimpleOnGestureListener() {
|
||||||
|
private var lastUpEvent: MotionEvent? = null
|
||||||
|
|
||||||
override fun onDoubleTap(e: MotionEvent): Boolean {
|
override fun onDoubleTap(e: MotionEvent): Boolean {
|
||||||
val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
|
val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
|
||||||
.putExtra(
|
.putExtra(
|
||||||
@@ -195,11 +197,16 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
|
override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
|
||||||
message.showKeyboard()
|
if (lastUpEvent !== null) {
|
||||||
|
message.onTouchEvent(lastUpEvent)
|
||||||
|
lastUpEvent?.recycle()
|
||||||
|
lastUpEvent = null
|
||||||
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSingleTapUp(e: MotionEvent): Boolean {
|
override fun onSingleTapUp(e: MotionEvent): Boolean {
|
||||||
|
lastUpEvent = MotionEvent.obtain(e)
|
||||||
return true // don't show soft keyboard on this event
|
return true // don't show soft keyboard on this event
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user