Skip to content

Fix crash on long-press when a placeholder is the only popup key #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiMoHo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash on long-press when a placeholder is the only popup key #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/helium314/keyboard/keyboard/Key.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ public KeyParams(
final String[] popupKeys = PopupKeysUtilsKt.createPopupKeysArray(popupSet, mKeyboardParams, label != null ? label : keySpec);
mPopupKeysColumnAndFlags = getPopupKeysColumnAndFlagsAndSetNullInArray(params, popupKeys);
final String[] finalPopupKeys = popupKeys == null ? null : PopupKeySpec.filterOutEmptyString(popupKeys);
if (finalPopupKeys != null) {
if (finalPopupKeys != null && finalPopupKeys.length > 0) {
actionFlags |= ACTION_FLAGS_ENABLE_LONG_PRESS;
mPopupKeys = new PopupKeySpec[finalPopupKeys.length];
for (int i = 0; i < finalPopupKeys.length; i++) {
Expand Down
21 changes: 21 additions & 0 deletions app/src/test/java/helium314/keyboard/KeyboardParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,27 @@ f""", // no newline at the end
}
}

@Test fun placeholderAsOnlyPopup() { // https://github.com/HeliBorg/HeliBoard/issues/1324
val keyParams = LayoutParser.parseJsonString("""[[{ "label": "ক", "popup": { "relevant": [
{ "type": "placeholder" }
]
} }]]""").flatMap { row -> row.mapNotNull { it.compute(params)?.toKeyParams(params) } }.single()
assertEquals(null, keyParams.mPopupKeys)
keyParams.mAbsoluteWidth = 1f
keyParams.mAbsoluteHeight = 1f
val key = keyParams.createKey()
assertEquals(false, key.isLongPressEnabled)
}

@Test fun placeholderNextToOtherPopup() {
val key = LayoutParser.parseJsonString("""[[{ "label": "ক", "popup": { "relevant": [
{ "type": "placeholder" }, { "label": "k" }
]
} }]]""").flatMap { row -> row.mapNotNull { it.compute(params) } }.single()
assertEquals(1, key.toKeyParams(params).mPopupKeys?.size)
assertEquals("k", key.toKeyParams(params).mPopupKeys?.first()?.mLabel)
}

@Test fun popupSymbolAlpha() {
val key = LayoutParser.parseJsonString("""[[{ "label": "c", "popup": {
"main": { "code": -10001, "label": "x" }
Expand Down