luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-23 17:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A11Y: Add some null checks to avoid crashes when running with accessibility turned on

Browse source 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
This commit is contained in:
Peter Vágner 2020-11-27 08:11:07 +01:00 • committed by Daniele Laudani
parent dc46c14f9c
commit f7c6178bec
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/dslul/openboard/inputmethod/accessibility/KeyboardAccessibilityDelegate.kt
View file

@ -112,7 +112,7 @@ open class KeyboardAccessibilityDelegate<KV : KeyboardView?>(protected val mKeyb
* @param event The hover event. * @param event The hover event.
* @return key The key that the `event` is on. * @return key The key that the `event` is on.
*/ */
protected fun getHoverKeyOf(event: MotionEvent): Key { protected fun getHoverKeyOf(event: MotionEvent): Key? {
val actionIndex = event.actionIndex val actionIndex = event.actionIndex
val x = event.getX(actionIndex).toInt() val x = event.getX(actionIndex).toInt()
val y = event.getY(actionIndex).toInt() val y = event.getY(actionIndex).toInt()
@ -145,7 +145,7 @@ open class KeyboardAccessibilityDelegate<KV : KeyboardView?>(protected val mKeyb
if (DEBUG_HOVER) { if (DEBUG_HOVER) {
Log.d(TAG, "onHoverEnter: key=$key") Log.d(TAG, "onHoverEnter: key=$key")
} }
key.let { onHoverEnterTo(it) } key?.let { onHoverEnterTo(it) }
mLastHoverKey = key mLastHoverKey = key
} }
@ -159,9 +159,9 @@ open class KeyboardAccessibilityDelegate<KV : KeyboardView?>(protected val mKeyb
val key = getHoverKeyOf(event) val key = getHoverKeyOf(event)
if (key !== lastKey) { if (key !== lastKey) {
lastKey?.let { onHoverExitFrom(it) } lastKey?.let { onHoverExitFrom(it) }
key.let { onHoverEnterTo(it) } key?.let { onHoverEnterTo(it) }
} }
key.let { onHoverMoveWithin(it) } key?.let { onHoverMoveWithin(it) }
mLastHoverKey = key mLastHoverKey = key
} }
@ -179,8 +179,8 @@ open class KeyboardAccessibilityDelegate<KV : KeyboardView?>(protected val mKeyb
val key = getHoverKeyOf(event) val key = getHoverKeyOf(event)
// Make sure we're not getting an EXIT event because the user slid // Make sure we're not getting an EXIT event because the user slid
// off the keyboard area, then force a key press. // off the keyboard area, then force a key press.
performClickOn(key) key?.let { performClickOn(it)
onHoverExitFrom(key) onHoverExitFrom(it) }
mLastHoverKey = null mLastHoverKey = null
} }

2
app/src/main/java/org/dslul/openboard/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.kt
View file

@ -209,7 +209,7 @@ class KeyboardAccessibilityNodeProvider<KV : KeyboardView?>(keyboardView: KV,
} }
override fun performAction(virtualViewId: Int, action: Int, override fun performAction(virtualViewId: Int, action: Int,
arguments: Bundle): Boolean { arguments: Bundle?): Boolean {
val key = getKeyOf(virtualViewId) ?: return false val key = getKeyOf(virtualViewId) ?: return false
return performActionForKey(key, action) return performActionForKey(key, action)
} }