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

am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev 

* commit '758c74fe82683aef08d93a935433c027a7bc21a7':
  Fix an NPE in recorrection
main
Jean Chalard 2013-04-19 00:07:37 -07:00 committed by Android Git Automerger
parent 3629605b7c 758c74fe82
commit f1dde6a1bf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1684,7 +1684,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
private SuggestedWords getSuggestedWordsGestureLocked(final InputPointers batchPointers) { private SuggestedWords getSuggestedWordsGestureLocked(final InputPointers batchPointers) {
mLatinIme.mWordComposer.setBatchInputPointers(batchPointers); mLatinIme.mWordComposer.setBatchInputPointers(batchPointers);
final SuggestedWords suggestedWords = final SuggestedWords suggestedWords =
mLatinIme.getSuggestedWords(Suggest.SESSION_GESTURE); mLatinIme.getSuggestedWordsOrOlderSuggestions(Suggest.SESSION_GESTURE);
final int suggestionCount = suggestedWords.size(); final int suggestionCount = suggestedWords.size();
if (suggestionCount <= 1) { if (suggestionCount <= 1) {
final String mostProbableSuggestion = (suggestionCount == 0) ? null final String mostProbableSuggestion = (suggestionCount == 0) ? null
@ -2161,7 +2161,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
return; return;
} }
final SuggestedWords suggestedWords = getSuggestedWords(Suggest.SESSION_TYPING); final SuggestedWords suggestedWords =
getSuggestedWordsOrOlderSuggestions(Suggest.SESSION_TYPING);
final String typedWord = mWordComposer.getTypedWord(); final String typedWord = mWordComposer.getTypedWord();
showSuggestionStrip(suggestedWords, typedWord); showSuggestionStrip(suggestedWords, typedWord);
} }
@ -2171,7 +2172,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (keyboard == null || mSuggest == null) { if (keyboard == null || mSuggest == null) {
return SuggestedWords.EMPTY; return SuggestedWords.EMPTY;
} }
final String typedWord = mWordComposer.getTypedWord();
// Get the word on which we should search the bigrams. If we are composing a word, it's // Get the word on which we should search the bigrams. If we are composing a word, it's
// whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we // whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we
// should just skip whitespace if any, so 1. // should just skip whitespace if any, so 1.
@ -2179,10 +2179,13 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
final String prevWord = final String prevWord =
mConnection.getNthPreviousWord(mSettings.getCurrent().mWordSeparators, mConnection.getNthPreviousWord(mSettings.getCurrent().mWordSeparators,
mWordComposer.isComposingWord() ? 2 : 1); mWordComposer.isComposingWord() ? 2 : 1);
final SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer, return mSuggest.getSuggestedWords(mWordComposer, prevWord, keyboard.getProximityInfo(),
prevWord, keyboard.getProximityInfo(), mSettings.getCurrent().mCorrectionEnabled, mSettings.getCurrent().mCorrectionEnabled, sessionId);
sessionId); }
return maybeRetrieveOlderSuggestions(typedWord, suggestedWords);
private SuggestedWords getSuggestedWordsOrOlderSuggestions(final int sessionId) {
return maybeRetrieveOlderSuggestions(mWordComposer.getTypedWord(),
getSuggestedWords(sessionId));
} }
private SuggestedWords maybeRetrieveOlderSuggestions(final String typedWord, private SuggestedWords maybeRetrieveOlderSuggestions(final String typedWord,
@ -2195,7 +2198,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// old suggestions. Also, if we are showing the "add to dictionary" hint, we need to // old suggestions. Also, if we are showing the "add to dictionary" hint, we need to
// revert to suggestions - although it is unclear how we can come here if it's displayed. // revert to suggestions - although it is unclear how we can come here if it's displayed.
if (suggestedWords.size() > 1 || typedWord.length() <= 1 if (suggestedWords.size() > 1 || typedWord.length() <= 1
|| suggestedWords.mTypedWordValid || suggestedWords.mTypedWordValid || null == mSuggestionStripView
|| mSuggestionStripView.isShowingAddToDictionaryHint()) { || mSuggestionStripView.isShowingAddToDictionaryHint()) {
return suggestedWords; return suggestedWords;
} else { } else {