Merge "Compare scrubbed strings when uncommitting LogUnits"
commit
a2f3f17de6
|
@ -863,7 +863,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
// Check that expected word matches.
|
// Check that expected word matches.
|
||||||
if (oldLogUnit != null) {
|
if (oldLogUnit != null) {
|
||||||
final String oldLogUnitWords = oldLogUnit.getWordsAsString();
|
final String oldLogUnitWords = oldLogUnit.getWordsAsString();
|
||||||
if (oldLogUnitWords != null && !oldLogUnitWords.equals(expectedWord)) {
|
// 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.
|
||||||
|
if (oldLogUnitWords != null && !oldLogUnitWords.equals(
|
||||||
|
scrubDigitsFromString(expectedWord))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue