From 22e3bebaa56c0c2b8464025e6f6cbd82ad283663 Mon Sep 17 00:00:00 2001 From: alexknop Date: Mon, 8 Jan 2024 08:15:53 -0500 Subject: [PATCH] remove redundant calls to isNumber (#410) Co-authored-by: Alex Knop --- src/io/github/sspanak/tt9/ime/KeyPadHandler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java index 528be1d9..c7541f47 100644 --- a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java +++ b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java @@ -126,7 +126,11 @@ abstract class KeyPadHandler extends InputMethodService { } // start tracking key hold - if (Key.isNumber(keyCode) || Key.isHotkey(settings, -keyCode)) { + if (Key.isNumber(keyCode)) { + event.startTracking(); + return true; + } + else if (Key.isHotkey(settings, -keyCode)) { event.startTracking(); } @@ -135,8 +139,7 @@ abstract class KeyPadHandler extends InputMethodService { } return - Key.isNumber(keyCode) - || Key.isOK(keyCode) + Key.isOK(keyCode) || handleHotkey(keyCode, true, false, true) // hold a hotkey, handled in onKeyLongPress()) || handleHotkey(keyCode, false, keyRepeatCounter + 1 > 0, true) // press a hotkey, handled in onKeyUp() || Key.isPoundOrStar(keyCode) && onText(String.valueOf((char) event.getUnicodeChar()), true) @@ -160,6 +163,7 @@ abstract class KeyPadHandler extends InputMethodService { if (Key.isNumber(keyCode)) { numKeyRepeatCounter = 0; lastNumKeyCode = 0; + return onNumber(Key.codeToNumber(settings, keyCode), true, 0); } else { keyRepeatCounter = 0; lastKeyCode = 0; @@ -169,10 +173,6 @@ abstract class KeyPadHandler extends InputMethodService { return true; } - if (Key.isNumber(keyCode)) { - return onNumber(Key.codeToNumber(settings, keyCode), true, 0); - } - ignoreNextKeyUp = 0; return false; }