fix: prevent NPE

osfans · Dec 30, 2023 · ab36ded · ab36ded
1 parent 0c971be
commit ab36ded
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java
@@ -573,12 +573,14 @@ private void reset() {
 
   /** Must be called on the UI thread */
   public void initKeyboard() {
-    reset();
-    // setNavBarColor();
-    textInputManager.setShouldUpdateRimeOption(true); // 不能在Rime.onMessage中調用set_option，會卡死
-    bindKeyboardToInputView();
-    // loadBackground(); // reset()调用过resetCandidate()，resetCandidate()一键调用过loadBackground();
-    updateComposing(); // 切換主題時刷新候選
+    if (textInputManager != null) {
+      reset();
+      // setNavBarColor();
+      textInputManager.setShouldUpdateRimeOption(true); // 不能在Rime.onMessage中調用set_option，會卡死
+      bindKeyboardToInputView();
+      // loadBackground(); // reset()调用过resetCandidate()，resetCandidate()一键调用过loadBackground();
+      updateComposing(); // 切換主題時刷新候選
+    }
   }
 
   public void initKeyboardDarkMode(boolean darkMode) {
@@ -723,10 +725,6 @@ public void onUpdateSelection(
     }
     // Update the caps-lock status for the current cursor position.
     dispatchCapsStateToInputView();
-
-    Timber.d(
-        "OnUpdateSelection: old: %d, %d, new: %d, %d, candidate: %d, %d",
-        oldSelStart, oldSelEnd, newSelStart, newSelEnd, candidatesStart, candidatesEnd);
   }
 
   @Override
@@ -987,6 +985,9 @@ public boolean onRimeKey(int[] event) {
   }
 
   private boolean composeEvent(@NonNull KeyEvent event) {
+    if (textInputManager == null) {
+      return false;
+    }
     final int keyCode = event.getKeyCode();
     if (keyCode == KeyEvent.KEYCODE_MENU) return false; // 不處理 Menu 鍵
     if (!Keycode.Companion.isStdKey(keyCode)) return false; // 只處理安卓標準按鍵