refactor(ime): reduce redundant text committing functions

osfans · Oct 4, 2024 · fa6e56c · fa6e56c
1 parent 4af1789
commit fa6e56c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
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
@@ -295,7 +295,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
     private fun handleRimeResponse(response: RimeResponse) {
         val (commit, ctx, _) = response
         if (commit != null && !commit.text.isNullOrEmpty()) {
-            commitCharSequence(commit.text)
+            commitText(commit.text)
         }
         if (ctx != null) {
             updateComposingText(ctx)
@@ -561,35 +561,23 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
     }
 
     // 直接commit不做任何处理
-    fun commitCharSequence(
+    fun commitText(
         text: CharSequence,
         clearMeatKeyState: Boolean = false,
-    ): Boolean {
-        val ic = currentInputConnection ?: return false
-        ic.commitText(text, 1)
-        if (text.isNotEmpty()) {
+    ) {
+        val ic = currentInputConnection ?: return
+        if (ic.commitText(text, 1)) {
             lastCommittedText = text
         }
         if (clearMeatKeyState) {
             ic.clearMetaKeyStates(KeyEvent.getModifierMetaStateMask())
             DraftHelper.onInputEventChanged()
         }
-        return true
-    }
-
-    /**
-     * Commit the current composing text together with the new text
-     *
-     * @param text the new text to be committed
-     */
-    fun commitText(text: String?) {
-        currentInputConnection.finishComposingText()
-        commitCharSequence(text!!, true)
     }
 
     private fun commitTextByChar(text: String) {
         for (char in text) {
-            if (!commitCharSequence(char.toString(), false)) break
+            commitText(char.toString())
         }
     }
 

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt
@@ -198,7 +198,7 @@ class CommonKeyboardActionListener(
                             "set_color_scheme" -> ColorManager.setColorScheme(arg)
                             else -> {
                                 ShortcutUtils.call(service, event.command, arg)?.let {
-                                    service.commitCharSequence(it)
+                                    service.commitText(it)
                                     service.updateComposing()
                                 }
                             }
@@ -260,7 +260,7 @@ class CommonKeyboardActionListener(
                 if ((metaState == KeyEvent.META_SHIFT_ON || metaState == 0) && keyEventCode >= Keycode.A.ordinal) {
                     val text = Keycode.getSymbolLabel(Keycode.valueOf(keyEventCode))
                     if (text.length == 1) {
-                        service.commitCharSequence(text)
+                        service.commitText(text)
                         return
                     }
                 }
@@ -291,10 +291,10 @@ class CommonKeyboardActionListener(
                             //  for this.
                             if (Rime.simulateKeySequence(slice)) {
                                 if (Rime.isAsciiMode) {
-                                    service.commitCharSequence(slice)
+                                    service.commitText(slice)
                                 }
                             } else {
-                                service.commitCharSequence(slice)
+                                service.commitText(slice)
                             }
                         }
                         BRACED_KEY_EVENT.matches(sequence) -> {

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
@@ -266,7 +266,7 @@ class KeyboardWindow(
         override fun onEvent(event: Event) {
             if (event.commit.isNotEmpty()) {
                 // Directly commit the text and don't dispatch to Rime
-                service.commitCharSequence(event.commit, true)
+                service.commitText(event.commit, true)
                 return
             }
 

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/DbAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/DbAdapter.kt
@@ -25,7 +25,7 @@ class DbAdapter(
     var type = SymbolBoardType.CLIPBOARD
 
     override fun onPaste(bean: DatabaseBean) {
-        service.commitText(bean.text)
+        service.commitText(bean.text ?: "")
     }
 
     override fun onPin(bean: DatabaseBean) {