Skip to content

Commit 9506fd7

Browse files
committed
fix: temporary workaround for duplicated return action (again)
1 parent b5fbc33 commit 9506fd7

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,11 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
275275
it.data.let event@{
276276
val keyCode = it.value.keyCode
277277
if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {
278+
// TODO: look for better workaround for this
279+
if (keyCode == KeyEvent.KEYCODE_ENTER) {
280+
handleReturnKey()
281+
return@event
282+
}
278283
val eventTime = SystemClock.uptimeMillis()
279284
if (it.up) {
280285
sendUpKeyEvent(eventTime, keyCode, it.modifiers.metaState)
@@ -318,7 +323,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
318323
instance = null
319324
}
320325

321-
fun handleReturnKey() {
326+
private fun handleReturnKey() {
322327
currentInputEditorInfo.run {
323328
if (inputType and InputType.TYPE_MASK_CLASS == InputType.TYPE_NULL) {
324329
sendDownUpKeyEvents(KeyEvent.KEYCODE_ENTER)

app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ class CommonKeyboardActionListener(
279279
shouldReleaseKey = false
280280

281281
when (keyEventCode) {
282-
KeyEvent.KEYCODE_ENTER -> service.handleReturnKey()
283-
KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_ESCAPE -> service.requestHideSelf(0)
282+
KeyEvent.KEYCODE_BACK -> service.requestHideSelf(0)
284283
else -> {
285284
// 小键盘自动增加锁定
286285
if (keyEventCode in KeyEvent.KEYCODE_NUMPAD_0..KeyEvent.KEYCODE_NUMPAD_EQUALS) {

0 commit comments

Comments
 (0)