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

am db961227: Fix the NPE on selection string on unlearnWord 

* commit 'db96122787a57632136566e2448c21aa96879955':
  Fix the NPE on selection string on unlearnWord
main
Mohammadinamul Sheik 2015-04-13 23:49:43 +00:00 committed by Android Git Automerger
parent 694f6dbd53 db96122787
commit 70f0c72135
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -48,6 +48,7 @@ import com.android.inputmethod.latin.utils.SpannableStringUtils;
import com.android.inputmethod.latin.utils.TextRange; import com.android.inputmethod.latin.utils.TextRange;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/** /**
* Enrichment class for InputConnection to simplify interaction and add functionality. * Enrichment class for InputConnection to simplify interaction and add functionality.
@ -288,6 +289,7 @@ public final class RichInputConnection implements PrivateCommandPerformer {
} }
} }
@Nullable
public CharSequence getSelectedText(final int flags) { public CharSequence getSelectedText(final int flags) {
return isConnected() ? mIC.getSelectedText(flags) : null; return isConnected() ? mIC.getSelectedText(flags) : null;
} }

7
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -1089,8 +1089,11 @@ public final class InputLogic {
// If there is a selection, remove it. // If there is a selection, remove it.
// We also need to unlearn the selected text. // We also need to unlearn the selected text.
final CharSequence selection = mConnection.getSelectedText(0 /* 0 for no styles */); final CharSequence selection = mConnection.getSelectedText(0 /* 0 for no styles */);
unlearnWord(selection.toString(), inputTransaction.mSettingsValues, if (!TextUtils.isEmpty(selection)) {
Constants.EVENT_BACKSPACE); unlearnWord(selection.toString(), inputTransaction.mSettingsValues,
Constants.EVENT_BACKSPACE);
hasUnlearnedWordBeingDeleted = true;
}
final int numCharsDeleted = mConnection.getExpectedSelectionEnd() final int numCharsDeleted = mConnection.getExpectedSelectionEnd()
- mConnection.getExpectedSelectionStart(); - mConnection.getExpectedSelectionStart();
mConnection.setSelection(mConnection.getExpectedSelectionEnd(), mConnection.setSelection(mConnection.getExpectedSelectionEnd(),