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

am 65e3ae6f: Merge "Remove useless method call for spell checker." 

* commit '65e3ae6f153a136902eaaf4da217496802c1daa1':
  Remove useless method call for spell checker.
main
Keisuke Kuroyanagi 2013-12-25 22:45:22 -08:00 committed by Android Git Automerger
parent a53fdb6aa9 65e3ae6f15
commit 1aacc4d60a
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,34 +25,26 @@ import java.util.ArrayList;
import java.util.Locale;
public final class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryDictionary {
private boolean mClosed;
private final Object mLock = new Object();
public SynchronouslyLoadedContactsBinaryDictionary(final Context context, final Locale locale) {
super(context, locale);
}
@Override
public synchronized ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,
public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,
final String prevWordForBigrams, final ProximityInfo proximityInfo,
final boolean blockOffensiveWords, final int[] additionalFeaturesOptions) {
reloadDictionaryIfRequired();
return super.getSuggestions(codes, prevWordForBigrams, proximityInfo, blockOffensiveWords,
additionalFeaturesOptions);
synchronized (mLock) {
return super.getSuggestions(codes, prevWordForBigrams, proximityInfo,
blockOffensiveWords, additionalFeaturesOptions);
}
}
@Override
public synchronized boolean isValidWord(final String word) {
reloadDictionaryIfRequired();
return isValidWordInner(word);
public boolean isValidWord(final String word) {
synchronized (mLock) {
return super.isValidWord(word);
}
// Protect against multiple closing
@Override
public synchronized void close() {
// Actually with the current implementation of ContactsDictionary it's safe to close
// several times, so the following protection is really only for foolproofing
if (mClosed) return;
mClosed = true;
super.close();
}
}

17
java/src/com/android/inputmethod/latin/SynchronouslyLoadedUserBinaryDictionary.java
View File

@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Locale;
public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionary {
private final Object mLock = new Object();
public SynchronouslyLoadedUserBinaryDictionary(final Context context, final Locale locale) {
this(context, locale, false);
@ -36,17 +37,19 @@ public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDic
}
@Override
public synchronized ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,
public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,
final String prevWordForBigrams, final ProximityInfo proximityInfo,
final boolean blockOffensiveWords, final int[] additionalFeaturesOptions) {
reloadDictionaryIfRequired();
return super.getSuggestions(codes, prevWordForBigrams, proximityInfo, blockOffensiveWords,
additionalFeaturesOptions);
synchronized (mLock) {
return super.getSuggestions(codes, prevWordForBigrams, proximityInfo,
blockOffensiveWords, additionalFeaturesOptions);
}
}
@Override
public synchronized boolean isValidWord(final String word) {
reloadDictionaryIfRequired();
return isValidWordInner(word);
public boolean isValidWord(final String word) {
synchronized (mLock) {
return super.isValidWord(word);
}
}
}

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

@ -383,6 +383,8 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
new Thread("spellchecker_close_dicts") {
@Override
public void run() {
// Contacts dictionary can be closed multiple times here. If the dictionary is
// already closed, extra closings are no-ops, so it's safe.
for (DictionaryPool pool : oldPools.values()) {
pool.close();
}