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

am a6166d37: Fix a bug where Latin IME crashes on spell checker request 

* commit 'a6166d3776c810e51789bfdc19e4823acd4a2f18':
  Fix a bug where Latin IME crashes on spell checker request
main
Jean Chalard 2012-06-05 03:40:49 -07:00 committed by Android Git Automerger
parent 18c4137c87 a6166d3776
commit c750f9eb53
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/SynchronouslyLoadedContactsBinaryDictionary.java
View File

@ -20,12 +20,13 @@ import android.content.Context;
import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.keyboard.ProximityInfo;
import java.util.Locale;
public class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryDictionary { public class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryDictionary {
private boolean mClosed; private boolean mClosed;
public SynchronouslyLoadedContactsBinaryDictionary(final Context context) { public SynchronouslyLoadedContactsBinaryDictionary(final Context context, final Locale locale) {
// TODO: add locale information. super(context, Suggest.DIC_CONTACTS, locale);
super(context, Suggest.DIC_CONTACTS, null);
} }
@Override @Override
@ -51,4 +52,4 @@ public class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryD
mClosed = true; mClosed = true;
super.close(); super.close();
} }
} }

10
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View File

@ -155,7 +155,9 @@ public class AndroidSpellCheckerService extends SpellCheckerService
private void startUsingContactsDictionaryLocked() { private void startUsingContactsDictionaryLocked() {
if (null == mContactsDictionary) { if (null == mContactsDictionary) {
if (LatinIME.USE_BINARY_CONTACTS_DICTIONARY) { if (LatinIME.USE_BINARY_CONTACTS_DICTIONARY) {
mContactsDictionary = new SynchronouslyLoadedContactsBinaryDictionary(this); // TODO: use the right locale for each session
mContactsDictionary =
new SynchronouslyLoadedContactsBinaryDictionary(this, Locale.getDefault());
} else { } else {
mContactsDictionary = new SynchronouslyLoadedContactsDictionary(this); mContactsDictionary = new SynchronouslyLoadedContactsDictionary(this);
} }
@ -436,7 +438,11 @@ public class AndroidSpellCheckerService extends SpellCheckerService
// TODO: revert to the concrete type when USE_BINARY_CONTACTS_DICTIONARY is no // TODO: revert to the concrete type when USE_BINARY_CONTACTS_DICTIONARY is no
// longer needed // longer needed
if (LatinIME.USE_BINARY_CONTACTS_DICTIONARY) { if (LatinIME.USE_BINARY_CONTACTS_DICTIONARY) {
mContactsDictionary = new SynchronouslyLoadedContactsBinaryDictionary(this); // TODO: use the right locale. We can't do it right now because the
// spell checker is reusing the contacts dictionary across sessions
// without regard for their locale, so we need to fix that first.
mContactsDictionary = new SynchronouslyLoadedContactsBinaryDictionary(this,
Locale.getDefault());
} else { } else {
mContactsDictionary = new SynchronouslyLoadedContactsDictionary(this); mContactsDictionary = new SynchronouslyLoadedContactsDictionary(this);
} }