Skip to content
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

Jump to bottom

Fix crash getting spell-check suggestions #42466

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Fix crash getting spell-check suggestions #42466

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public void onGetSentenceSuggestions(SentenceSuggestionsInfo[] results) {
ArrayList<HashMap<String, Object>> spellCheckerSuggestionSpans =
new ArrayList<HashMap<String, Object>>();
SentenceSuggestionsInfo spellCheckResults = results[0];
if (spellCheckResults == null) {
pendingResult.success(new ArrayList<HashMap<String, Object>>());
pendingResult = null;
return;
}

for (int i = 0; i < spellCheckResults.getSuggestionsCount(); i++) {
SuggestionsInfo suggestionsInfo = spellCheckResults.getSuggestionsInfoAt(i);
Expand Down
18 changes: 18 additions & 0 deletions shell/platform/android/test/io/flutter/plugin/editing/SpellCheckPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,4 +247,22 @@ public void onGetSentenceSuggestionsResultsWithSuccessAndNoResultsWhenSuggestion

verify(mockResult).success(new ArrayList<HashMap<String, Object>>());
}

@Test
public void onGetSentenceSuggestionsResultsWithSuccessAndNoResultsWhenSuggestionsAreInvalid2() {
TextServicesManager fakeTextServicesManager = mock(TextServicesManager.class);
SpellCheckChannel fakeSpellCheckChannel = mock(SpellCheckChannel.class);
SpellCheckPlugin spellCheckPlugin =
spy(new SpellCheckPlugin(fakeTextServicesManager, fakeSpellCheckChannel));
MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
spellCheckPlugin.pendingResult = mockResult;

spellCheckPlugin.onGetSentenceSuggestions(
new SentenceSuggestionsInfo[] {
// This "suggestion" may be provided by the Samsung spell checker:
null
});

verify(mockResult).success(new ArrayList<HashMap<String, Object>>());
}
}