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

Merge "Fix: NPE when initializing AOSP keyboard."

main
Keisuke Kuroyanagi 2014-06-17 02:48:21 +00:00 committed by Android (Google) Code Review
parent ccfc824a88 34ed5b0742
commit 4c45fff240
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdater.java
View File

@ -23,11 +23,14 @@ import android.content.Context;
import com.android.inputmethod.latin.DictionaryFacilitator; import com.android.inputmethod.latin.DictionaryFacilitator;
public class PersonalizationDictionaryUpdater { public class PersonalizationDictionaryUpdater {
final Context mContext;
final DictionaryFacilitator mDictionaryFacilitator;
boolean mDictCleared = false;
public PersonalizationDictionaryUpdater(final Context context, public PersonalizationDictionaryUpdater(final Context context,
final DictionaryFacilitator dictionaryFacilitator) { final DictionaryFacilitator dictionaryFacilitator) {
// Clear and never update the personalization dictionary. mContext = context;
PersonalizationHelper.removeAllPersonalizationDictionaries(context); mDictionaryFacilitator = dictionaryFacilitator;
dictionaryFacilitator.clearPersonalizationDictionary();
} }
public Locale getLocale() { public Locale getLocale() {
@ -36,6 +39,12 @@ public class PersonalizationDictionaryUpdater {
public void onLoadSettings(final boolean usePersonalizedDicts, public void onLoadSettings(final boolean usePersonalizedDicts,
final boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes) { final boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes) {
if (!mDictCleared) {
// Clear and never update the personalization dictionary.
PersonalizationHelper.removeAllPersonalizationDictionaries(mContext);
mDictionaryFacilitator.clearPersonalizationDictionary();
mDictCleared = true;
}
} }
public void onDestroy() { public void onDestroy() {