diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-07-25 07:50:42 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-07-25 07:50:42 -0300 |
| commit | cd740fbacfac13627efd01d5cbba1e62fe370e11 (patch) | |
| tree | 8c1e54ebae45e477f74082082e422e312e688641 | |
| parent | b90ab861b991054c00c832826ff5995caa807ed9 (diff) | |
| parent | 8d1d5afdacabc1677385e7ec50d5a2c8518a6c38 (diff) | |
| download | mullvadvpn-cd740fbacfac13627efd01d5cbba1e62fe370e11.tar.xz mullvadvpn-cd740fbacfac13627efd01d5cbba1e62fe370e11.zip | |
Merge branch 'fix-redaction'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | mullvad-problem-report/src/main.rs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a80239817..fda725ddfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,8 @@ Line wrap the file at 100 chars. Th - Disable account input when logging in. - Keep the user input in problem report form while the app runs, or until the report is successfully submitted. +- Ignore empty strings as redaction requests, to avoid adding redacted messages between every + character of the log message. #### Windows - Hide the app icon from taskbar. diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs index eeab6bd346..63c4c5af20 100644 --- a/mullvad-problem-report/src/main.rs +++ b/mullvad-problem-report/src/main.rs @@ -277,7 +277,9 @@ struct ProblemReport { impl ProblemReport { /// Creates a new problem report with system information. Logs can be added with `add_log`. /// Logs will have all strings in `redact_custom_strings` removed from them. - pub fn new(redact_custom_strings: Vec<String>) -> Self { + pub fn new(mut redact_custom_strings: Vec<String>) -> Self { + redact_custom_strings.retain(|redact| !redact.is_empty()); + ProblemReport { metadata: collect_metadata(), logs: Vec::new(), |
