From: Roopesh Chander <roop@roopc.net>
Date: Tue, 4 Dec 2018 08:20:43 +0000 (+0530)
Subject: Settings: Add timestamp to exported log
X-Git-Tag: 0.0.20181104-5~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e386e85e43d3eda01cbd303ee188ad1527db922;p=thirdparty%2Fwireguard-apple.git

Settings: Add timestamp to exported log

And remove the exported log afterwards.

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
index 994eb22..6f8410e 100644
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
@@ -96,7 +96,10 @@ class SettingsTableViewController: UITableViewController {
             return
         }
 
-        let destinationURL = destinationDir.appendingPathComponent("WireGuard_iOS_log.txt")
+        let dateFormatter = ISO8601DateFormatter()
+        dateFormatter.formatOptions = [.withFullDate, .withTime, .withTimeZone] // Avoid ':' in the filename
+        let timeStampString = dateFormatter.string(from: Date())
+        let destinationURL = destinationDir.appendingPathComponent("WireGuard_iOS_log_\(timeStampString).txt")
 
         if (FileManager.default.fileExists(atPath: destinationURL.path)) {
             do {
@@ -126,6 +129,10 @@ class SettingsTableViewController: UITableViewController {
         // popoverPresentationController shall be non-nil on the iPad
         activityVC.popoverPresentationController?.sourceView = sourceView
         activityVC.popoverPresentationController?.sourceRect = sourceView.bounds
+        activityVC.completionWithItemsHandler = { (_, _, _, _) in
+            // Remove the exported log file after the activity has completed
+            try? FileManager.default.removeItem(at: destinationURL)
+        }
         self.present(activityVC, animated: true)
     }