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

am 0dbae774: Merge "Avoid an NPE" 

* commit '0dbae774969c4f467b9d51f621eca4c3a58a2717':
  Avoid an NPE
main
Kurt Partridge 2013-06-03 19:48:05 -07:00 committed by Android Git Automerger
parent 267928c976 0dbae77496
commit 0486b377e7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/com/android/inputmethod/research/ResearchLogger.java
View File

@ -854,23 +854,22 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// The user has deleted this word and returned to the previous. Check that the word in the // The user has deleted this word and returned to the previous. Check that the word in the
// logUnit matches the expected word. If so, restore the last log unit committed to be the // logUnit matches the expected word. If so, restore the last log unit committed to be the
// current logUnit. I.e., pull out the last LogUnit from all the LogBuffers, and make // current logUnit. I.e., pull out the last LogUnit from all the LogBuffers, and make
// restore it to mCurrentLogUnit so the new edits are captured with the word. Optionally // it the mCurrentLogUnit so the new edits are captured with the word. Optionally dump the
// dump the contents of mCurrentLogUnit (useful if they contain deletions of the next word // contents of mCurrentLogUnit (useful if they contain deletions of the next word that
// that should not be reported to protect user privacy) // should not be reported to protect user privacy)
// //
// Note that we don't use mLastLogUnit here, because it only goes one word back and is only // Note that we don't use mLastLogUnit here, because it only goes one word back and is only
// needed for reverts, which only happen one back. // needed for reverts, which only happen one back.
final LogUnit oldLogUnit = mMainLogBuffer.peekLastLogUnit(); final LogUnit oldLogUnit = mMainLogBuffer.peekLastLogUnit();
// Check that expected word matches. // Check that expected word matches. It's ok if both strings are null, because this is the
// case where the LogUnit is storing a non-word, e.g. a separator.
if (oldLogUnit != null) { if (oldLogUnit != null) {
final String oldLogUnitWords = oldLogUnit.getWordsAsString();
// Because the word is stored in the LogUnit with digits scrubbed, the comparison must // Because the word is stored in the LogUnit with digits scrubbed, the comparison must
// be made on a scrubbed version of the expectedWord as well. // be made on a scrubbed version of the expectedWord as well.
if (oldLogUnitWords != null && !oldLogUnitWords.equals( final String scrubbedExpectedWord = scrubDigitsFromString(expectedWord);
scrubDigitsFromString(expectedWord))) { final String oldLogUnitWords = oldLogUnit.getWordsAsString();
return; if (!TextUtils.equals(scrubbedExpectedWord, oldLogUnitWords)) return;
}
} }
// Uncommit, merging if necessary. // Uncommit, merging if necessary.
@ -986,7 +985,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
return Character.isDigit(codePoint) ? DIGIT_REPLACEMENT_CODEPOINT : codePoint; return Character.isDigit(codePoint) ? DIGIT_REPLACEMENT_CODEPOINT : codePoint;
} }
/* package for test */ static String scrubDigitsFromString(String s) { /* package for test */ static String scrubDigitsFromString(final String s) {
if (s == null) return null;
StringBuilder sb = null; StringBuilder sb = null;
final int length = s.length(); final int length = s.length();
for (int i = 0; i < length; i = s.offsetByCodePoints(i, 1)) { for (int i = 0; i < length; i = s.offsetByCodePoints(i, 1)) {