From eee94f2924a612807f688cde08809d58620835e4 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Thu, 14 Sep 2023 19:21:54 +0200 Subject: [PATCH] make it compile (again, why did it work before?) --- .../org/dslul/openboard/inputmethod/event/Combiner.kt | 2 +- .../openboard/inputmethod/event/DeadKeyCombiner.kt | 10 +++++----- .../openboard/inputmethod/event/HangulCombiner.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/event/Combiner.kt b/app/src/main/java/org/dslul/openboard/inputmethod/event/Combiner.kt index 5d1886c73..8b2d91fd5 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/event/Combiner.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/event/Combiner.kt @@ -17,7 +17,7 @@ interface Combiner { * @param event the event to combine with the existing state. * @return the resulting event. */ - fun processEvent(previousEvents: ArrayList?, event: Event?): Event + fun processEvent(previousEvents: ArrayList?, event: Event): Event /** * Get the feedback that should be shown to the user for the current state of this combiner. diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/event/DeadKeyCombiner.kt b/app/src/main/java/org/dslul/openboard/inputmethod/event/DeadKeyCombiner.kt index 4081fed7a..678c91c6e 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/event/DeadKeyCombiner.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/event/DeadKeyCombiner.kt @@ -188,18 +188,18 @@ class DeadKeyCombiner : Combiner { // TODO: make this a list of events instead val mDeadSequence = StringBuilder() - override fun processEvent(previousEvents: ArrayList?, event: Event?): Event { + override fun processEvent(previousEvents: ArrayList?, event: Event): Event { if (TextUtils.isEmpty(mDeadSequence)) { // No dead char is currently being tracked: this is the most common case. - if (event!!.isDead) { // The event was a dead key. Start tracking it. + if (event.isDead) { // The event was a dead key. Start tracking it. mDeadSequence.appendCodePoint(event.mCodePoint) return Event.createConsumedEvent(event) } // Regular keystroke when not keeping track of a dead key. Simply said, there are -// no dead keys at all in the current input, so this combiner has nothing to do and -// simply returns the event as is. The majority of events will go through this path. + // no dead keys at all in the current input, so this combiner has nothing to do and + // simply returns the event as is. The majority of events will go through this path. return event } - if (Character.isWhitespace(event!!.mCodePoint) + if (Character.isWhitespace(event.mCodePoint) || event.mCodePoint == mDeadSequence.codePointBefore(mDeadSequence.length)) { // When whitespace or twice the same dead key, we should output the dead sequence as is. val resultEvent = createEventChainFromSequence(mDeadSequence.toString(), event) mDeadSequence.setLength(0) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt b/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt index db9bf7eb6..d5328d3d5 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt @@ -11,8 +11,8 @@ class HangulCombiner : Combiner { val history: MutableList = mutableListOf() val syllable: HangulSyllable? get() = history.lastOrNull() - override fun processEvent(previousEvents: ArrayList?, event: Event?): Event? { - if(event == null || event.mKeyCode == Constants.CODE_SHIFT) return event + override fun processEvent(previousEvents: ArrayList?, event: Event): Event { + if(event.mKeyCode == Constants.CODE_SHIFT) return event if(Character.isWhitespace(event.mCodePoint)) { val text = combiningStateFeedback reset()