Skip to content

Fix: handle null EditorInfo in onStartInput #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewtavis merged 2 commits into from
Sep 17, 2026
Merged

Fix: handle null EditorInfo in onStartInput #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea66c7
fixed
Roniscend Sep 16, 2026
9212b59
Merge branch 'main' into fix-onstartinput
andrewtavis Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ Emojis for the following are chosen based on [gitmoji](https://gitmoji.dev/).

### Bug Fixes

- The keyboard service no longer crashes when an editor starts input with no `EditorInfo` ([#699](https://github.com/scribe-org/Scribe-Android/issues/699)).
- Downloading or checking for language data updates no longer crashes the app when the server returns a malformed timestamp ([#700](https://github.com/scribe-org/Scribe-Android/issues/700)).

### 🔒 Security
Expand Down
9 changes: 5 additions & 4 deletions app/src/keyboards/java/be/scri/services/GeneralKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,16 +442,17 @@ abstract class GeneralKeyboardIME(
restarting: Boolean,
) {
super.onStartInput(attribute, restarting)
inputTypeClass = attribute!!.inputType and TYPE_MASK_CLASS
enterKeyType = attribute.imeOptions and (IME_MASK_ACTION or IME_FLAG_NO_ENTER_ACTION)
val editorInfo = attribute ?: EditorInfo()
inputTypeClass = editorInfo.inputType and TYPE_MASK_CLASS
enterKeyType = editorInfo.imeOptions and (IME_MASK_ACTION or IME_FLAG_NO_ENTER_ACTION)
currentEnterKeyType = enterKeyType

// This setter triggers the logic in the property override if not shadowed.
hasTextBeforeCursor = currentInputConnection?.getTextBeforeCursor(1, 0)?.isNotEmpty() == true

isNumericKeyboardActive = shouldUseNumericKeyboard(attribute.inputType)
isNumericKeyboardActive = shouldUseNumericKeyboard(editorInfo.inputType)
keyboardMode = if (isNumericKeyboardActive) keyboardSymbols else keyboardLetters
val keyboardXml = getKeyboardLayoutXMLForInputType(attribute.inputType, getKeyboardLayoutXML())
val keyboardXml = getKeyboardLayoutXMLForInputType(editorInfo.inputType, getKeyboardLayoutXML())

loadLanguageData()

Expand Down
12 changes: 12 additions & 0 deletions app/src/testKeyboards/kotlin/be/scri/services/GeneralKeyboardIMEInputTypeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package be.scri.services

import android.text.InputType
import android.view.inputmethod.EditorInfo
import be.scri.R
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
Expand Down Expand Up @@ -55,4 +56,15 @@ class GeneralKeyboardIMEInputTypeTest {
GeneralKeyboardIME.getKeyboardLayoutXMLForInputType(inputType, R.xml.keys_letters_english),
)
}

@Test
fun defaultEditorInfo_fallsBackToLetterLayout() {
val fallback = EditorInfo()

assertFalse(GeneralKeyboardIME.shouldUseNumericKeyboard(fallback.inputType))
assertEquals(
R.xml.keys_letters_english,
GeneralKeyboardIME.getKeyboardLayoutXMLForInputType(fallback.inputType, R.xml.keys_letters_english),
)
}
}
Loading