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

Commit 211103d7 authored by Kurt Partridge's avatar Kurt Partridge
Browse files

[Rlog58a] Fix privacy leak of word in logUnitStart

Change-Id: Idcea4cd0256581e9868ac987fd1fa281ff074483
parent 75e69753
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ import java.util.Map;
                // will not have been opened for writing.
                if (jsonWriter == null) {
                    jsonWriter = researchLog.getValidJsonWriterLocked();
                    outputLogUnitStart(jsonWriter);
                    outputLogUnitStart(jsonWriter, isIncludingPrivateData);
                }
                outputLogStatementToLocked(jsonWriter, mLogStatementList.get(i), mValuesList.get(i),
                        mTimeList.get(i));
@@ -169,11 +169,14 @@ import java.util.Map;
    private static final String LOG_UNIT_BEGIN_KEY = "logUnitStart";
    private static final String LOG_UNIT_END_KEY = "logUnitEnd";

    private void outputLogUnitStart(final JsonWriter jsonWriter) {
    private void outputLogUnitStart(final JsonWriter jsonWriter,
            final boolean isIncludingPrivateData) {
        try {
            jsonWriter.beginObject();
            jsonWriter.name(CURRENT_TIME_KEY).value(System.currentTimeMillis());
            if (isIncludingPrivateData) {
                jsonWriter.name(WORD_KEY).value(getWord());
            }
            jsonWriter.name(EVENT_TYPE_KEY).value(LOG_UNIT_BEGIN_KEY);
            jsonWriter.endObject();
        } catch (IOException e) {