fix: crash on getLabel

osfans · Jan 25, 2024 · f566a1a · f566a1a
1 parent 1a9d5ca
commit f566a1a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 38 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt
@@ -69,8 +69,9 @@ class Event(keyboard: Keyboard?, var s: String) {
         get() {
             val state = states?.get(if (getOption(toggle)) 1 else 0)
             if (state != null) return state
+            if (mKeyboard == null) return adjustCase(field)
 
-            if (mKeyboard!!.isOnlyShiftOn) {
+            if (mKeyboard.isOnlyShiftOn) {
                 if (code >= KeyEvent.KEYCODE_0 && code <= KeyEvent.KEYCODE_9 && !defaultInstance().keyboard.hookShiftNum) {
                     return adjustCase(
                         shiftLabel,

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt
@@ -58,11 +58,11 @@ class Keyboard() {
     // private boolean mShifted;
 
     /** 鍵盤的Shift鍵  */
-    private var mShiftKey: Key? = null
-    private var mCtrlKey: Key? = null
-    private var mAltKey: Key? = null
-    private var mMetaKey: Key? = null
-    private var mSymKey: Key? = null
+    var mShiftKey: Key? = null
+    var mCtrlKey: Key? = null
+    var mAltKey: Key? = null
+    var mMetaKey: Key? = null
+    var mSymKey: Key? = null
 
     /**
      * Total height of the keyboard, including the padding and keys
@@ -438,26 +438,6 @@ class Keyboard() {
         }
     }
 
-    fun getmShiftKey(): Key? {
-        return mShiftKey
-    }
-
-    fun getmAltKey(): Key? {
-        return mAltKey
-    }
-
-    fun getmMetaKey(): Key? {
-        return mMetaKey
-    }
-
-    fun getmSymKey(): Key? {
-        return mSymKey
-    }
-
-    fun getmCtrlKey(): Key? {
-        return mCtrlKey
-    }
-
     fun setModiferKey(
         c: Int,
         key: Key?,
@@ -614,7 +594,6 @@ class Keyboard() {
     //    if (mFunctionKey != null) mFunctionKey.setOn(on);
     //    return setModifier(KeyEvent.META_FUNCTION_ON, on || keyDown);
     //  }
-    enum class Mask
 
     private val MASK_META_WITHOUT_SHIFT = KeyEvent.META_CTRL_ON or KeyEvent.META_ALT_ON or KeyEvent.META_SYM_ON or KeyEvent.META_META_ON
     private val MASK_META_WITHOUT_CTRL = KeyEvent.META_SHIFT_ON or KeyEvent.META_ALT_ON or KeyEvent.META_SYM_ON or KeyEvent.META_META_ON

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt
@@ -712,23 +712,22 @@ class KeyboardView(context: Context?, attrs: AttributeSet?) : View(context, attr
             } else {
                 false
             }
+
+    /**
+     * 返回鍵盤是否爲大寫狀態
+     */
     val isCapsOn: Boolean
-        /**
-         * 返回鍵盤是否爲大寫狀態
-         *
-         * @return true 如果大寫
-         */
-        get() = if (mKeyboard != null && mKeyboard!!.getmShiftKey() != null) mKeyboard!!.getmShiftKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mShiftKey != null) mKeyboard!!.mShiftKey!!.isOn else false
     val isShiftOn: Boolean
-        get() = if (mKeyboard != null && mKeyboard!!.getmShiftKey() != null) mKeyboard!!.getmShiftKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mShiftKey != null) mKeyboard!!.mShiftKey!!.isOn else false
     val isAltOn: Boolean
-        get() = if (mKeyboard != null && mKeyboard!!.getmAltKey() != null) mKeyboard!!.getmAltKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mAltKey != null) mKeyboard!!.mAltKey!!.isOn else false
     val isSysOn: Boolean
-        get() = if (mKeyboard != null && mKeyboard!!.getmSymKey() != null) mKeyboard!!.getmSymKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mSymKey != null) mKeyboard!!.mSymKey!!.isOn else false
     val isCtrlOn: Boolean
-        get() = if (mKeyboard != null && mKeyboard!!.getmCtrlKey() != null) mKeyboard!!.getmCtrlKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mCtrlKey != null) mKeyboard!!.mCtrlKey!!.isOn else false
     val isMetaOn: Boolean
-        get() = if (mKeyboard != null && mKeyboard!!.getmMetaKey() != null) mKeyboard!!.getmMetaKey()!!.isOn else false
+        get() = if (mKeyboard != null && mKeyboard!!.mMetaKey != null) mKeyboard!!.mMetaKey!!.isOn else false
 
     // public void setVerticalCorrection(int verticalOffset) {}