From 7ff8dd4fc9bc11fac818740d4cc18fb1bf2f3731 Mon Sep 17 00:00:00 2001
From: Davide <keeshux@gmail.com>
Date: Wed, 29 Jan 2025 11:35:18 +0100
Subject: [PATCH] Decrease max log age to 1 day

Reuse log filenames in report issue.
---
 .../Views/Diagnostics/iOS/ReportIssueButton+iOS.swift         | 4 ++--
 .../Views/Diagnostics/macOS/ReportIssueButton+macOS.swift     | 4 ++--
 Packages/App/Sources/CommonLibrary/Resources/Constants.json   | 2 +-
 Packages/App/Sources/UILibrary/L10n/Strings+Unlocalized.swift | 4 ----
 Packages/PassepartoutKit-Source                               | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/ReportIssueButton+iOS.swift b/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/ReportIssueButton+iOS.swift
index b2ecca4f..db27199b 100644
--- a/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/ReportIssueButton+iOS.swift
+++ b/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/ReportIssueButton+iOS.swift
@@ -103,10 +103,10 @@ private extension Issue {
         var list: [MailComposerView.Attachment] = []
         let mimeType = Strings.Unlocalized.Issues.attachmentMimeType
         if let appLog {
-            list.append(.init(data: appLog, mimeType: mimeType, fileName: Strings.Unlocalized.Issues.appLogFilename))
+            list.append(.init(data: appLog, mimeType: mimeType, fileName: Constants.shared.log.appPath))
         }
         if let tunnelLog {
-            list.append(.init(data: tunnelLog, mimeType: mimeType, fileName: Strings.Unlocalized.Issues.tunnelLogFilename))
+            list.append(.init(data: tunnelLog, mimeType: mimeType, fileName: Constants.shared.log.tunnelPath))
         }
         return list
     }
diff --git a/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/ReportIssueButton+macOS.swift b/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/ReportIssueButton+macOS.swift
index 7de63190..3dfe3d69 100644
--- a/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/ReportIssueButton+macOS.swift
+++ b/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/ReportIssueButton+macOS.swift
@@ -70,10 +70,10 @@ private extension Issue {
     var items: [Any] {
         var list: [Any] = []
         list.append(body)
-        if let appLog, let url = appLog.toTemporaryURL(withFilename: Strings.Unlocalized.Issues.appLogFilename) {
+        if let appLog, let url = appLog.toTemporaryURL(withFilename: Constants.shared.log.appPath) {
             list.append(url)
         }
-        if let tunnelLog, let url = tunnelLog.toTemporaryURL(withFilename: Strings.Unlocalized.Issues.tunnelLogFilename) {
+        if let tunnelLog, let url = tunnelLog.toTemporaryURL(withFilename: Constants.shared.log.tunnelPath) {
             list.append(url)
         }
         return list
diff --git a/Packages/App/Sources/CommonLibrary/Resources/Constants.json b/Packages/App/Sources/CommonLibrary/Resources/Constants.json
index 7d115fca..22d74bbd 100644
--- a/Packages/App/Sources/CommonLibrary/Resources/Constants.json
+++ b/Packages/App/Sources/CommonLibrary/Resources/Constants.json
@@ -41,7 +41,7 @@
             "maxLevel": 3,
             "maxSize": 500000,
             "maxBufferedLines": 5000,
-            "maxAge": 259200
+            "maxAge": 86400
         },
         "formatter": {
             "timestamp": "HH:mm:ss",
diff --git a/Packages/App/Sources/UILibrary/L10n/Strings+Unlocalized.swift b/Packages/App/Sources/UILibrary/L10n/Strings+Unlocalized.swift
index 7fb3cfe2..92d356e4 100644
--- a/Packages/App/Sources/UILibrary/L10n/Strings+Unlocalized.swift
+++ b/Packages/App/Sources/UILibrary/L10n/Strings+Unlocalized.swift
@@ -92,10 +92,6 @@ extension Strings {
             public static let subject = "\(appName) - Report issue"
 
             public static let attachmentMimeType = "text/plain"
-
-            public static let appLogFilename = "app.log"
-
-            public static let tunnelLogFilename = "tunnel.log"
         }
 
         public static let appName = "Passepartout"
diff --git a/Packages/PassepartoutKit-Source b/Packages/PassepartoutKit-Source
index 33ba8113..d9b51757 160000
--- a/Packages/PassepartoutKit-Source
+++ b/Packages/PassepartoutKit-Source
@@ -1 +1 @@
-Subproject commit 33ba8113401dd84428d82c64edbcbe6f60752599
+Subproject commit d9b51757ece45c294a0d29f11ca8281c03a983a9