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

Commit f07024e0 authored by Kurt Partridge's avatar Kurt Partridge
Browse files

Compare scrubbed strings when uncommitting LogUnits

A LogUnit is only uncommitted if the LogUnit's word matches what is
expected.  But a LogUnit never stores numbers, only scrubbed words that
replace numbers with a special character.  So when uncommitting, the
text from the TextView must also be scrubbed for the comparison to pass
correctly.

Bug: 9088919

Change-Id: I9b56f10afce6d0cc84eb9ead3b9a9b1e061ae39c
parent a0c3e02d
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -863,7 +863,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
        // Check that expected word matches.
        if (oldLogUnit != null) {
            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;
            }
        }