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

Merge "Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()"

Browse source
This commit is contained in:
Keisuke Kuroyanagi 2014-05-14 12:20:10 +00:00 committed by Android (Google) Code Review
commit ee59975420
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
View file

@ -90,19 +90,14 @@ public class DistracterFilter {
*/ */
public boolean isDistracterToWordsInDictionaries(final String prevWord, public boolean isDistracterToWordsInDictionaries(final String prevWord,
final String testedWord) { final String testedWord) {
if (mSuggest == null) { if (mSuggest == null || mKeyboard == null) {
return false; return false;
} }
final WordComposer composer = new WordComposer(); final WordComposer composer = new WordComposer();
final int[] codePoints = StringUtils.toCodePointArray(testedWord); final int[] codePoints = StringUtils.toCodePointArray(testedWord);
final int[] coordinates; final int[] coordinates;
if (null == mKeyboard) { coordinates = mKeyboard.getCoordinates(codePoints);
coordinates = CoordinateUtils.newCoordinateArray(codePoints.length,
Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE);
} else {
coordinates = mKeyboard.getCoordinates(codePoints);
}
composer.setComposingWord(codePoints, coordinates, prevWord); composer.setComposingWord(codePoints, coordinates, prevWord);
final int trailingSingleQuotesCount = composer.trailingSingleQuotesCount(); final int trailingSingleQuotesCount = composer.trailingSingleQuotesCount();