1
0
Fork 0

remove redundant calls to isNumber (#410)

Co-authored-by: Alex Knop <alexknoptech@protonmail.com>
This commit is contained in:
alexknop 2024-01-08 08:15:53 -05:00 committed by GitHub
parent 2f448636e9
commit 22e3bebaa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -126,7 +126,11 @@ abstract class KeyPadHandler extends InputMethodService {
} }
// start tracking key hold // 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(); event.startTracking();
} }
@ -135,8 +139,7 @@ abstract class KeyPadHandler extends InputMethodService {
} }
return return
Key.isNumber(keyCode) Key.isOK(keyCode)
|| Key.isOK(keyCode)
|| handleHotkey(keyCode, true, false, true) // hold a hotkey, handled in onKeyLongPress()) || handleHotkey(keyCode, true, false, true) // hold a hotkey, handled in onKeyLongPress())
|| handleHotkey(keyCode, false, keyRepeatCounter + 1 > 0, true) // press a hotkey, handled in onKeyUp() || handleHotkey(keyCode, false, keyRepeatCounter + 1 > 0, true) // press a hotkey, handled in onKeyUp()
|| Key.isPoundOrStar(keyCode) && onText(String.valueOf((char) event.getUnicodeChar()), true) || Key.isPoundOrStar(keyCode) && onText(String.valueOf((char) event.getUnicodeChar()), true)
@ -160,6 +163,7 @@ abstract class KeyPadHandler extends InputMethodService {
if (Key.isNumber(keyCode)) { if (Key.isNumber(keyCode)) {
numKeyRepeatCounter = 0; numKeyRepeatCounter = 0;
lastNumKeyCode = 0; lastNumKeyCode = 0;
return onNumber(Key.codeToNumber(settings, keyCode), true, 0);
} else { } else {
keyRepeatCounter = 0; keyRepeatCounter = 0;
lastKeyCode = 0; lastKeyCode = 0;
@ -169,10 +173,6 @@ abstract class KeyPadHandler extends InputMethodService {
return true; return true;
} }
if (Key.isNumber(keyCode)) {
return onNumber(Key.codeToNumber(settings, keyCode), true, 0);
}
ignoreNextKeyUp = 0; ignoreNextKeyUp = 0;
return false; return false;
} }