nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix: NPE after turning on personalized suggestion."

Browse source
This commit is contained in:
Keisuke Kuroyanagi 2014-06-09 05:35:31 +00:00 committed by Android (Google) Code Review
commit 9f02a67c77
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
View file

@ -574,6 +574,12 @@ public class DictionaryFacilitator {
final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) { final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) {
final ExpandableBinaryDictionary personalizationDict = final ExpandableBinaryDictionary personalizationDict =
mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION); mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION);
if (personalizationDict == null) {
if (callback != null) {
callback.onFinished();
}
return;
}
final ArrayList<LanguageModelParam> languageModelParams = final ArrayList<LanguageModelParam> languageModelParams =
LanguageModelParam.createLanguageModelParamsFrom( LanguageModelParam.createLanguageModelParamsFrom(
personalizationDataChunk.mTokens, personalizationDataChunk.mTokens,
@ -581,8 +587,7 @@ public class DictionaryFacilitator {
this /* dictionaryFacilitator */, spacingAndPunctuations, this /* dictionaryFacilitator */, spacingAndPunctuations,
new DistracterFilterCheckingIsInDictionary( new DistracterFilterCheckingIsInDictionary(
mDistracterFilter, personalizationDict)); mDistracterFilter, personalizationDict));
if (personalizationDict == null || languageModelParams == null if (languageModelParams == null || languageModelParams.isEmpty()) {
|| languageModelParams.isEmpty()) {
if (callback != null) { if (callback != null) {
callback.onFinished(); callback.onFinished();
} }