Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 895b70b8 authored by Jean Chalard's avatar Jean Chalard
Browse files

Move some treatment to a more sensical place. 

It makes more sense to catch words with the safety net in
updateSuggestions() than in showSuggestions(). Also, it's useless
to do it in updateBigramPredictions, because the result will
always be provably false.
This will also help with writing unit tests.

Change-Id: Ifab81e6c5a74b1aa75cf85ef7742fee69a98f5ce
parent 9b018902

java/src/com/android/inputmethod/latin/LatinIME.java

+6 −6
Original line number Diff line number Diff line
@@ -1827,18 +1827,18 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions);

            }

        }

        final SuggestedWords suggestedWords = builder.build();

        if (Utils.shouldBlockAutoCorrectionBySafetyNet(suggestedWords, mSuggest)) {

            suggestedWords.setShouldBlockAutoCorrectionBySatefyNet();

        }

        showSuggestions(builder.build(), typedWord);

    }



    public void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) {

        final boolean shouldBlockAutoCorrectionBySafetyNet =

                Utils.shouldBlockAutoCorrectionBySafetyNet(suggestedWords, mSuggest);

        if (shouldBlockAutoCorrectionBySafetyNet) {

            suggestedWords.setShouldBlockAutoCorrectionBySatefyNet();

        }

        final CharSequence autoCorrection;

        if (suggestedWords.size() > 0) {

            if (!shouldBlockAutoCorrectionBySafetyNet && suggestedWords.hasAutoCorrectionWord()) {

            if (!suggestedWords.shouldBlockAutoCorrectionBySafetyNet()

                    && suggestedWords.hasAutoCorrectionWord()) {

                autoCorrection = suggestedWords.getWord(1);

            } else {

                autoCorrection = typedWord;