fix: currentKeyboardView has not been initialized, causing crash

if-can · Bambooin · commit c62cdd57fef7 · 2025-01-19T19:20:15.000+08:00
diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -237,7 +237,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                         commitText(commit.text)
                     }
                     updateComposingText(ctx)
-                    KeyboardSwitcher.currentKeyboardView.invalidateAllKeys()
+                    KeyboardSwitcher.currentKeyboardView?.invalidateAllKeys()
                 }
             is RimeMessage.KeyMessage ->
                 it.data.let event@{
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt
@@ -8,5 +8,5 @@ package com.osfans.trime.ime.keyboard
 @Deprecated("Migrate into KeyboardWindow")
 object KeyboardSwitcher {
     lateinit var currentKeyboard: Keyboard
-    lateinit var currentKeyboardView: KeyboardView
+    var currentKeyboardView: KeyboardView? = null
 }

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {`
`237`	`237`	`commitText(commit.text)`
`238`	`238`	`}`
`239`	`239`	`updateComposingText(ctx)`
`240`		`- KeyboardSwitcher.currentKeyboardView.invalidateAllKeys()`
	`240`	`+ KeyboardSwitcher.currentKeyboardView?.invalidateAllKeys()`
`241`	`241`	`}`
`242`	`242`	`is RimeMessage.KeyMessage ->`
`243`	`243`	`it.data.let event@{`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ package com.osfans.trime.ime.keyboard`
`8`	`8`	`@Deprecated("Migrate into KeyboardWindow")`
`9`	`9`	`object KeyboardSwitcher {`
`10`	`10`	`lateinit var currentKeyboard: Keyboard`
`11`		`- lateinit var currentKeyboardView: KeyboardView`
	`11`	`+ var currentKeyboardView: KeyboardView? = null`
`12`	`12`	`}`