Add backup log files to problem report

2 files changed, 29 insertions, 19 deletions

diff --git a/ios/MullvadVPN/ConsolidatedApplicationLog.swift b/ios/MullvadVPN/ConsolidatedApplicationLog.swift
index 1b868caf01..1e52ba10e1 100644
--- a/ios/MullvadVPN/ConsolidatedApplicationLog.swift
+++ b/ios/MullvadVPN/ConsolidatedApplicationLog.swift
@@ -57,27 +57,18 @@ class ConsolidatedApplicationLog: TextOutputStreamable {
         }
     }
 
-    func addLogFile(fileURL: URL) {
-        guard fileURL.isFileURL else {
-            addError(message: fileURL.absoluteString, error: Error.invalidLogFileURL(fileURL))
-            return
-        }
-
-        let path = fileURL.path
-        let redactedPath = redact(string: path)
-
-        switch Self.readFileLossy(path: path, maxBytes: kLogMaxReadBytes) {
-        case .success(let lossyString):
-            let redactedString = redact(string: lossyString)
-            logs.append(LogAttachment(label: redactedPath, content: redactedString))
-
-        case .failure(let error):
-            addError(message: redactedPath, error: error)
+    func addLogFile(fileURL: URL, includeLogBackup: Bool) {
+        addSingleLogFile(fileURL)
+        if includeLogBackup {
+            let oldLogFileURL = fileURL.deletingPathExtension().appendingPathExtension("old.log")
+            addSingleLogFile(oldLogFileURL)
         }
     }
 
-    func addLogFiles(fileURLs: [URL]) {
-        fileURLs.forEach(self.addLogFile)
+    func addLogFiles(fileURLs: [URL], includeLogBackups: Bool) {
+        for fileURL in fileURLs {
+            addLogFile(fileURL: fileURL, includeBackupLog: includeLogBackups)
+        }
     }
 
     func addError<ErrorType: ChainedError>(message: String, error: ErrorType) {
@@ -108,6 +99,25 @@ class ConsolidatedApplicationLog: TextOutputStreamable {
         }
     }
 
+    private func addSingleLogFile(_ fileURL: URL) {
+        guard fileURL.isFileURL else {
+            addError(message: fileURL.absoluteString, error: Error.invalidLogFileURL(fileURL))
+            return
+        }
+
+        let path = fileURL.path
+        let redactedPath = redact(string: path)
+
+        switch Self.readFileLossy(path: path, maxBytes: kLogMaxReadBytes) {
+        case .success(let lossyString):
+            let redactedString = redact(string: lossyString)
+            logs.append(LogAttachment(label: redactedPath, content: redactedString))
+
+        case .failure(let error):
+            addError(message: redactedPath, error: error)
+        }
+    }
+
     private static func makeMetadata() -> Metadata {
         let osVersion = ProcessInfo.processInfo.operatingSystemVersion
         let osVersionString = "iOS \(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
diff --git a/ios/MullvadVPN/ProblemReportViewController.swift b/ios/MullvadVPN/ProblemReportViewController.swift
index 1535d1ec26..cd6ec4a490 100644
--- a/ios/MullvadVPN/ProblemReportViewController.swift
+++ b/ios/MullvadVPN/ProblemReportViewController.swift
@@ -25,7 +25,7 @@ class ProblemReportViewController: UIViewController, UITextFieldDelegate, Condit
             redactContainerPathsForSecurityGroupIdentifiers: [securityGroupIdentifier]
         )
 
-        report.addLogFiles(fileURLs: ApplicationConfiguration.logFileURLs)
+        report.addLogFiles(fileURLs: ApplicationConfiguration.logFileURLs, includeLogBackup: true)
 
         return report
     }()