fix: filter invalid key behavior tokens during keyboard parsing - #2067
Open
ENOA-REIAH-UION wants to merge 2 commits into
Open
fix: filter invalid key behavior tokens during keyboard parsing#2067ENOA-REIAH-UION wants to merge 2 commits into
ENOA-REIAH-UION wants to merge 2 commits into
Conversation
Since commit 5b78b88, getLabel() dynamically resolves space key label. Caching KeyAction instances for space keys is now safe and no longer risks stale labl.
There was a problem hiding this comment.
Pull request overview
This PR aims to harden keyboard theme parsing by filtering out invalid key-behavior tokens, and simplifies KeyActionManager caching logic.
Changes:
- Refactors
TextKeyboard.TextKey.decode()to build thebehaviorsmap viaassociateWith(...)and filter out invalid tokens. - Simplifies
KeyActionManager.getAction(KeyActionToken)to useMutableMap.getOrPut(...)for caching.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| app/src/main/java/com/osfans/trime/data/theme/model/TextKeyboard.kt | Refactors behavior-token decoding + adds filtering for “invalid” tokens during keyboard parsing. |
| app/src/main/java/com/osfans/trime/data/theme/KeyActionManager.kt | Simplifies action caching logic using getOrPut. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+117
to
+124
| .filter { (behavior, token) -> | ||
| token?.let { | ||
| when (it) { | ||
| is KeyActionToken.Plain -> it.token.isNotEmpty() | ||
| is KeyActionToken.Inline -> listOfNotNull(it.token.commit, it.token.text, it.token.label).isNotEmpty() | ||
| } | ||
| } ?: (behavior == KeyBehavior.CLICK) | ||
| }, |
| actionCache[token] = it | ||
| } | ||
| } | ||
| fun getAction(token: KeyActionToken): KeyAction = actionCache.getOrPut(token) { KeyAction(token) } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull request
Issue tracker
Fixes will automatically close the related issues
Fixes #
Fixes #
Feature
Describe features of this pull request
Code of conduct
Code style
make sytle-lintBuild pass
make debugManually test
Code Review
Daily build
Login and download artifact at https://github.com/osfans/trime/actions
Additional Info