Refactor: remove isAvailable(), make build() return Skill<*>?#415
Merged
Stypox merged 9 commits intoMay 13, 2026
Merged
Conversation
Eliminates the race condition where a skill could be deemed available under one locale but then built/executed under a different locale after a language change. By merging the availability check into build() and returning null when the skill cannot be constructed, there is no longer a window between checking availability and building the skill where state can change. - Remove SkillInfo.isAvailable() abstract method - Change SkillInfo.build() return type from Skill<*> to Skill<*>? - Update all 15 SkillInfo implementations to return null if unavailable - Update SkillHandler to use mapNotNull for building skills - Update SkillSettingsScreen to use build() != null - Update test mocks and preview providers Addresses the root cause of the NPE in DicioTeam#412 at the architecture level.
Stypox
requested changes
May 12, 2026
Collaborator
Stypox
left a comment
Stypox
left a comment
There was a problem hiding this comment.
Thank you! I left some minor comments
Co-authored-by: Stypox <stypox@pm.me>
Co-authored-by: Stypox <stypox@pm.me>
Co-authored-by: Stypox <stypox@pm.me>
- Remove buildSkillFromInfo helper, inline fallback build
- CalculatorSkill: accept operators as constructor param, no runtime !!
- JokeSkill: accept resolved locale as constructor param, no runtime !!
- TelephoneInfo/TimerInfo: use ?: return null pattern, no !!
- FlashlightInfo: remove @SuppressLint("NewApi")
- SkillSettingsScreen: source availability from enabledSkillsInfo via
view model instead of calling build() in composable
enabledSkillsInfo only contains skills that are enabled AND available. A skill disabled by the user would incorrectly appear as unavailable (greyed out). Now disabled skills are assumed available since we cannot determine availability without building them.
mretallack
commented
May 12, 2026
Contributor
Author
@Stypox thanks, new commits pushed, if you want to have a quick look to see its the right direction. |
Stypox
requested changes
May 13, 2026
Collaborator
Stypox
left a comment
Stypox
left a comment
There was a problem hiding this comment.
Thanks for addressing the comments!
|
|
||
| val skills: List<SkillInfo> get() = skillHandler.allSkillInfoList | ||
|
|
||
| val enabledSkillsInfo = skillHandler.enabledSkillsInfo |
Collaborator
There was a problem hiding this comment.
(this would have had to be a getter just like skills, or it will cache skillHandler.enabledSkillsInfo instead of always getting the latest one)
FlashlightSkill uses API 23+ camera APIs. The annotation is needed since minSdk is 21, but the call is guarded by the FEATURE_CAMERA_FLASH check which ensures the code only runs on capable devices.
…ettings screen - TelephoneSkill/TimerSkill: accept yesNoData as constructor param, pass through to ConfirmCallOutput/ConfirmCancel to eliminate runtime !! - SkillSettingsScreen: revert to build() != null for availability check with comment noting potential performance concern - Remove enabledSkillsInfo from ViewModel (no longer needed)
Stypox
approved these changes
May 13, 2026
Collaborator
Stypox
left a comment
Stypox
left a comment
There was a problem hiding this comment.
LGTM, thank you!
(btw, when you pull in changes from main, I'd prefer if you rebase instead of creating a merge commit to keep the history clean; this is very minor so no worries)
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
2 participants
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.
Eliminates the race condition where a skill could be deemed available under one locale but then built/executed under a different locale after a language change.
By merging the availability check into build() and returning null when the skill cannot be constructed, there is no longer a window between checking availability and building the skill where state can change.
Addresses the root cause of the NPE in #412 at the architecture level.