fix(android/engine): Initialize index when resuming KeyboardPicker #12832
Conversation
This file contains 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
Fixes: #11714 Fixes: KEYMAN-ANDROID-39S Get the current keyboard index from shared preferences if it's uninitialized.
User Test ResultsTest specification and instructions User tests are not required |
sgschantz
requested changes
Dec 16, 2024
| @@ -252,7 +253,11 @@ protected void onResume() { | |||
| adapter.notifyDataSetChanged(); | |||
| } | |||
|
|
|||
| int curKbPos = KeyboardController.getInstance().getKeyboardIndex(KMKeyboard.currentKeyboard()); | |||
|
|
|||
| SharedPreferences prefs = this.getSharedPreferences(this.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); | |||
There was a problem hiding this comment.
prefs are only used if the currentKeyboard is null, so I would not initialize this unless it is null
Instead of the ternary operator, just use a regular if-else, so the logic is easier to follow, and we only load variables that we are going to use.
android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java
Outdated
Show resolved
Hide resolved
|
Changes in this pull request will be available for download in Keyman version 18.0.160-alpha |
mcdurdin
reviewed
Jan 13, 2025
| String currentKeyboardKey = KMKeyboard.currentKeyboard(); | ||
| if (currentKeyboardKey == null) { | ||
| SharedPreferences prefs = this.getSharedPreferences(this.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); | ||
| currentKeyboardIndex = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0); |
There was a problem hiding this comment.
What if the pref has an invalid index? Could this ever happen?
There was a problem hiding this comment.
The preference should only save valid indexes.
If the preference key doesn't exist, it'll fallback to 0.
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.
Fixes: #11714
Fixes: KEYMAN-ANDROID-39S
From the crash reports, it's possible for
KeyboardPickerActivityto resume, and have the keyboard keyKMKeyboard.currentKeyboard()be uninitialized (null).This updates
KeyboardPickerActivity.onResumeto get the keyboard index from the saved preference ifKMKeyboard.currentKeyboard()is null.@keymanapp-test-bot skip