Dump info again before zipping

max-signal · web-flow · commit c9d1f7a370bc · 2025-05-13T13:46:29.000-05:00
diff --git a/Signal/AppLaunch/AppDelegate.swift b/Signal/AppLaunch/AppDelegate.swift
@@ -561,6 +561,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             presentLaunchFailureActionSheet(
                 from: viewController,
                 supportTag: "CorruptRegistrationState",
+                logDumper: .fromGlobals(),
                 title: OWSLocalizedString(
                     "APP_LAUNCH_FAILURE_CORRUPT_REGISTRATION_TITLE",
                     comment: "Title for an error indicating that the app couldn't launch because some unexpected error happened with the user's registration status."
@@ -1052,6 +1053,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         presentLaunchFailureActionSheet(
             from: viewController,
             supportTag: preflightError.supportTag,
+            logDumper: .preLaunch(),
             title: title,
             message: message,
             actions: actions
@@ -1107,6 +1109,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         presentLaunchFailureActionSheet(
             from: viewController,
             supportTag: LaunchPreflightError.databaseUnrecoverablyCorrupted.supportTag,
+            logDumper: .preLaunch(),
             title: OWSLocalizedString(
                 "APP_LAUNCH_FAILURE_COULD_NOT_LOAD_DATABASE",
                 comment: "Error indicating that the app could not launch because the database could not be loaded."
@@ -1129,6 +1132,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     private func presentLaunchFailureActionSheet(
         from viewController: UIViewController,
         supportTag: String,
+        logDumper: DebugLogDumper,
         title: String,
         message: String,
         actions: [LaunchFailureActionSheetAction]
@@ -1141,6 +1145,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
                     self.presentLaunchFailureActionSheet(
                         from: viewController,
                         supportTag: supportTag,
+                        logDumper: logDumper,
                         title: title,
                         message: message,
                         actions: actions
@@ -1173,20 +1178,20 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             switch action {
             case .submitDebugLogsAndCrash:
                 addSubmitDebugLogsAction {
-                    DebugLogs.submitLogsWithSupportTag(supportTag) {
+                    DebugLogs.submitLogs(supportTag: supportTag, dumper: logDumper) {
                         owsFail("Exiting after submitting debug logs")
                     }
                 }
             case .submitDebugLogsAndLaunchApp(let window, let launchContext):
                 addSubmitDebugLogsAction { [unowned window] in
-                    DebugLogs.submitLogsWithSupportTag(supportTag) {
+                    DebugLogs.submitLogs(supportTag: supportTag, dumper: logDumper) {
                         ignoreErrorAndLaunchApp(in: window, launchContext: launchContext)
                     }
                 }
             case .submitDebugLogsWithDatabaseIntegrityCheckAndCrash(let databaseStorage):
                 addSubmitDebugLogsAction { [unowned viewController] in
                     SignalApp.showDatabaseIntegrityCheckUI(from: viewController, databaseStorage: databaseStorage) {
-                        DebugLogs.submitLogsWithSupportTag(supportTag) {
+                        DebugLogs.submitLogs(supportTag: supportTag, dumper: logDumper) {
                             owsFail("Exiting after submitting debug logs")
                         }
                     }
diff --git a/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift b/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift
@@ -796,6 +796,7 @@ extension ConversationViewController: CVComponentDelegate {
         sessionRefreshedActionSheet.addAction(ActionSheetAction(title: CommonStrings.contactSupport) { _ in
             ContactSupportActionSheet.present(
                 emailFilter: .custom("Signal iOS Session Refresh"),
+                logDumper: .fromGlobals(),
                 fromViewController: self
             )
         })
diff --git a/Signal/Notifications/NotificationActionHandler.swift b/Signal/Notifications/NotificationActionHandler.swift
@@ -342,7 +342,7 @@ public class NotificationActionHandler {
 
     private class func submitDebugLogs() async {
         await withCheckedContinuation { continuation in
-            DebugLogs.submitLogsWithSupportTag(nil) {
+            DebugLogs.submitLogs(dumper: .fromGlobals()) {
                 continuation.resume()
             }
         }
diff --git a/Signal/Provisioning/UserInterface/ProvisioningController.swift b/Signal/Provisioning/UserInterface/ProvisioningController.swift
@@ -120,7 +120,7 @@ class ProvisioningController: NSObject {
 
     @objc
     private func submitLogs() {
-        DebugLogs.submitLogsWithSupportTag("Onboarding")
+        DebugLogs.submitLogs(supportTag: "Onboarding", dumper: .fromGlobals())
     }
 
     // MARK: - Transitions
@@ -672,6 +672,7 @@ class ProvisioningController: NSObject {
                     // view controller.
                     ContactSupportActionSheet.present(
                         emailFilter: .backupImportFailed,
+                        logDumper: .fromGlobals(),
                         fromViewController: viewController
                     )
                 }
diff --git a/Signal/Provisioning/UserInterface/ProvisioningTransferQRCodeViewController.swift b/Signal/Provisioning/UserInterface/ProvisioningTransferQRCodeViewController.swift
@@ -135,6 +135,7 @@ class ProvisioningTransferQRCodeViewController: ProvisioningBaseViewController {
 
         ContactSupportActionSheet.present(
             emailFilter: .deviceTransfer,
+            logDumper: .fromGlobals(),
             fromViewController: self
         )
     }
diff --git a/Signal/Registration/UserInterface/RegistrationNavigationController.swift b/Signal/Registration/UserInterface/RegistrationNavigationController.swift
@@ -446,7 +446,7 @@ public class RegistrationNavigationController: OWSNavigationController {
 
     @objc
     private func didRequestToSubmitDebugLogs() {
-        DebugLogs.submitLogsWithSupportTag("Registration")
+        DebugLogs.submitLogs(supportTag: "Registration", dumper: .fromGlobals())
     }
 }
 
diff --git a/Signal/Registration/UserInterface/RegistrationPinViewController.swift b/Signal/Registration/UserInterface/RegistrationPinViewController.swift
@@ -716,7 +716,11 @@ class RegistrationPinViewController: OWSViewController {
 
         actionSheet.addAction(.init(title: CommonStrings.contactSupport) { [weak self] _ in
             guard let self else { return }
-            ContactSupportActionSheet.present(emailFilter: .registrationPINMode(state.contactSupportMode), fromViewController: self)
+            ContactSupportActionSheet.present(
+                emailFilter: .registrationPINMode(state.contactSupportMode),
+                logDumper: .fromGlobals(),
+                fromViewController: self,
+            )
         })
 
         actionSheet.addAction(OWSActionSheets.cancelAction)
diff --git a/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift b/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift
@@ -370,6 +370,7 @@ public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNav
 
         ContactSupportActionSheet.present(
             emailFilter: .deviceTransfer,
+            logDumper: .fromGlobals(),
             fromViewController: self
         )
     }
diff --git a/Signal/src/ViewControllers/AppSettings/ComposeSupportEmailOperation.swift b/Signal/src/ViewControllers/AppSettings/ComposeSupportEmailOperation.swift
@@ -15,10 +15,10 @@ struct SupportEmailModel {
 
         /// Attempt to upload the logs and include the resulting URL in the email body
         /// If the upload fails for one reason or another, continue anyway
-        case attemptUpload
+        case attemptUpload(DebugLogDumper)
 
         /// Upload the logs. If they fail to upload, fail the operation
-        case requireUpload
+        case requireUpload(DebugLogDumper)
 
         /// Don't upload new logs, instead use the provided link
         case link(URL)
@@ -129,15 +129,15 @@ final class ComposeSupportEmailOperation: NSObject {
             debugUrlString = nil
         case .link(let url):
             debugUrlString = url.absoluteString
-        case .attemptUpload:
+        case .attemptUpload(let dumper):
             do {
-                debugUrlString = try await uploadDebugLogWithTimeout().absoluteString
+                debugUrlString = try await uploadDebugLogWithTimeout(dumper: dumper).absoluteString
             } catch {
                 debugUrlString = "[Support note: Log upload failed — \(error.userErrorDescription)]"
             }
-        case .requireUpload:
+        case .requireUpload(let dumper):
             do {
-                debugUrlString = try await uploadDebugLogWithTimeout().absoluteString
+                debugUrlString = try await uploadDebugLogWithTimeout(dumper: dumper).absoluteString
             } catch {
                 throw EmailError.logUploadFailure(underlyingError: (error as? LocalizedError))
             }
@@ -159,10 +159,18 @@ final class ComposeSupportEmailOperation: NSObject {
         }
     }
 
-    private func uploadDebugLogWithTimeout() async throws -> URL {
+    private func uploadDebugLogWithTimeout(dumper: DebugLogDumper) async throws -> URL {
         do {
             return try await withCooperativeTimeout(seconds: 60) {
-                return try await DebugLogs.uploadLog()
+                do throws(DebugLogs.UploadDebugLogError) {
+                    return try await DebugLogs.uploadLogs(dumper: dumper)
+                } catch {
+                    // FIXME: Should we do something with the local log file?
+                    if let logArchiveOrDirectoryPath = error.logArchiveOrDirectoryPath {
+                        _ = OWSFileSystem.deleteFile(logArchiveOrDirectoryPath)
+                    }
+                    throw DebugLogsUploadError(localizedDescription: error.localizedErrorMessage)
+                }
             }
         } catch is CooperativeTimeoutError {
             throw EmailError.logUploadTimedOut
@@ -238,3 +246,11 @@ final class ComposeSupportEmailOperation: NSObject {
             .joined(separator: "\r\n")
     }
 }
+
+struct DebugLogsUploadError: Error, LocalizedError, UserErrorDescriptionProvider {
+    let localizedDescription: String
+
+    var errorDescription: String? {
+        localizedDescription
+    }
+}
diff --git a/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift b/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift
@@ -254,7 +254,7 @@ final class ContactSupportViewController: OWSTableViewController2 {
         var emailRequest = SupportEmailModel()
         emailRequest.userDescription = descriptionField.text
         emailRequest.emojiMood = emojiPicker.selectedMood
-        emailRequest.debugLogPolicy = debugSwitch.isOn ? .attemptUpload : .none
+        emailRequest.debugLogPolicy = debugSwitch.isOn ? .attemptUpload(.fromGlobals()) : .none
         if let selectedFilter = selectedFilter {
             emailRequest.supportFilter = "iOS \(selectedFilter.emailFilterString)"
         }
diff --git a/Signal/src/ViewControllers/AppSettings/HelpViewController.swift b/Signal/src/ViewControllers/AppSettings/HelpViewController.swift
@@ -60,7 +60,7 @@ final class HelpViewController: OWSTableViewController2 {
             name: OWSLocalizedString("SETTINGS_ADVANCED_SUBMIT_DEBUGLOG", comment: ""),
             accessibilityIdentifier: UIView.accessibilityIdentifier(in: self, name: "submit_debug_log"),
             actionBlock: {
-                DebugLogs.submitLogs()
+                DebugLogs.submitLogs(dumper: .fromGlobals())
             }
         ))
         contents.add(loggingSection)
diff --git a/Signal/src/ViewControllers/AppSettings/Linked Devices/LinkedDevicesView.swift b/Signal/src/ViewControllers/AppSettings/Linked Devices/LinkedDevicesView.swift
@@ -670,6 +670,7 @@ class LinkedDevicesHostingController: HostingContainer<LinkedDevicesView> {
 
                 ContactSupportActionSheet.present(
                     emailFilter: contactSupportEmailFilter,
+                    logDumper: .fromGlobals(),
                     fromViewController: self
                 )
             })
diff --git a/Signal/src/ViewControllers/DatabaseRecoveryViewController.swift b/Signal/src/ViewControllers/DatabaseRecoveryViewController.swift
@@ -207,7 +207,7 @@ class DatabaseRecoveryViewController<SetupResult>: OWSViewController {
     @objc
     private func didRequestToSubmitDebugLogs() {
         self.dismiss(animated: true) {
-            DebugLogs.submitLogsWithSupportTag(LaunchPreflightError.databaseCorruptedAndMightBeRecoverable.supportTag)
+            DebugLogs.submitLogs(supportTag: LaunchPreflightError.databaseCorruptedAndMightBeRecoverable.supportTag, dumper: .preLaunch())
         }
     }
 
diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController.swift b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController.swift
@@ -1341,7 +1341,11 @@ public class ChatListViewController: OWSViewController, HomeTabViewController {
             title: CommonStrings.contactSupport,
             handler: { [weak self] _ in
                 guard let self else { return }
-                ContactSupportActionSheet.present(emailFilter: .custom("NotLaunchingNSE"), fromViewController: self)
+                ContactSupportActionSheet.present(
+                    emailFilter: .custom("NotLaunchingNSE"),
+                    logDumper: .fromGlobals(),
+                    fromViewController: self,
+                )
             }
         ))
         actionSheet.addAction(ActionSheetAction(title: CommonStrings.okButton))
diff --git a/Signal/util/ContactSupportActionSheet.swift b/Signal/util/ContactSupportActionSheet.swift
@@ -35,7 +35,7 @@ enum ContactSupportActionSheet {
         }
     }
 
-    static func present(emailFilter: EmailFilter, fromViewController: UIViewController) {
+    static func present(emailFilter: EmailFilter, logDumper: DebugLogDumper, fromViewController: UIViewController) {
         Logger.warn("Presenting contact-support action sheet!")
 
         let submitWithLogTitle = OWSLocalizedString("CONTACT_SUPPORT_SUBMIT_WITH_LOG", comment: "Button text")
@@ -44,7 +44,7 @@ enum ContactSupportActionSheet {
 
             var emailRequest = SupportEmailModel()
             emailRequest.supportFilter = emailFilter.asString
-            emailRequest.debugLogPolicy = .requireUpload
+            emailRequest.debugLogPolicy = .requireUpload(logDumper)
 
             ModalActivityIndicatorViewController.present(
                 fromViewController: fromViewController,
@@ -57,7 +57,7 @@ enum ContactSupportActionSheet {
                         do {
                             try result.get()
                         } catch {
-                            showError(error, emailFilter: emailFilter, fromViewController: fromViewController)
+                            showError(error, emailFilter: emailFilter, logDumper: logDumper, fromViewController: fromViewController)
                         }
                     })
                 }
@@ -69,7 +69,7 @@ enum ContactSupportActionSheet {
             guard let fromViewController = fromViewController else { return }
 
             ComposeSupportEmailOperation.sendEmail(supportFilter: emailFilter.asString).catch { error in
-                showError(error, emailFilter: emailFilter, fromViewController: fromViewController)
+                showError(error, emailFilter: emailFilter, logDumper: logDumper, fromViewController: fromViewController)
             }
         }
 
@@ -83,12 +83,12 @@ enum ContactSupportActionSheet {
         fromViewController.present(actionSheet, animated: true)
     }
 
-    private static func showError(_ error: Error, emailFilter: EmailFilter, fromViewController: UIViewController) {
+    private static func showError(_ error: Error, emailFilter: EmailFilter, logDumper: DebugLogDumper, fromViewController: UIViewController) {
         let retryTitle = OWSLocalizedString("CONTACT_SUPPORT_PROMPT_ERROR_TRY_AGAIN", comment: "button text")
         let retryAction = ActionSheetAction(title: retryTitle, style: .default) { [weak fromViewController] _ in
             guard let fromViewController = fromViewController else { return }
 
-            present(emailFilter: emailFilter, fromViewController: fromViewController)
+            present(emailFilter: emailFilter, logDumper: logDumper, fromViewController: fromViewController)
         }
 
         let message = OWSLocalizedString("CONTACT_SUPPORT_PROMPT_ERROR_ALERT_BODY", comment: "Alert body")
@@ -99,27 +99,3 @@ enum ContactSupportActionSheet {
         fromViewController.present(actionSheet, animated: true)
     }
 }
-
-// MARK: -
-
-struct DebugLogsUploadError: Error, LocalizedError, UserErrorDescriptionProvider {
-    let localizedDescription: String
-
-    var errorDescription: String? {
-        localizedDescription
-    }
-}
-
-extension DebugLogs {
-    static func uploadLog() async throws(DebugLogsUploadError) -> URL {
-        do {
-            return try await DebugLogs.uploadLogs()
-        } catch {
-            // FIXME: Should we do something with the local log file?
-            if let logArchiveOrDirectoryPath = error.logArchiveOrDirectoryPath {
-                _ = OWSFileSystem.deleteFile(logArchiveOrDirectoryPath)
-            }
-            throw DebugLogsUploadError(localizedDescription: error.localizedErrorMessage)
-        }
-    }
-}
diff --git a/Signal/util/DebugLogs.swift b/Signal/util/DebugLogs.swift
diff --git a/SignalServiceKit/Storage/Database/KeyValueStore.swift b/SignalServiceKit/Storage/Database/KeyValueStore.swift

Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ extension ConversationViewController: CVComponentDelegate {`
`796`	`796`	`sessionRefreshedActionSheet.addAction(ActionSheetAction(title: CommonStrings.contactSupport) { _ in`
`797`	`797`	`ContactSupportActionSheet.present(`
`798`	`798`	`emailFilter: .custom("Signal iOS Session Refresh"),`
	`799`	`+ logDumper: .fromGlobals(),`
`799`	`800`	`fromViewController: self`
`800`	`801`	`)`
`801`	`802`	`})`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public class NotificationActionHandler {`
`342`	`342`
`343`	`343`	`private class func submitDebugLogs() async {`
`344`	`344`	`await withCheckedContinuation { continuation in`
`345`		`- DebugLogs.submitLogsWithSupportTag(nil) {`
	`345`	`+ DebugLogs.submitLogs(dumper: .fromGlobals()) {`
`346`	`346`	`continuation.resume()`
`347`	`347`	`}`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ class ProvisioningController: NSObject {`
`120`	`120`
`121`	`121`	`@objc`
`122`	`122`	`private func submitLogs() {`
`123`		`- DebugLogs.submitLogsWithSupportTag("Onboarding")`
	`123`	`+ DebugLogs.submitLogs(supportTag: "Onboarding", dumper: .fromGlobals())`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// MARK: - Transitions`
`@@ -672,6 +672,7 @@ class ProvisioningController: NSObject {`
`672`	`672`	`// view controller.`
`673`	`673`	`ContactSupportActionSheet.present(`
`674`	`674`	`emailFilter: .backupImportFailed,`
	`675`	`+ logDumper: .fromGlobals(),`
`675`	`676`	`fromViewController: viewController`
`676`	`677`	`)`
`677`	`678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ class ProvisioningTransferQRCodeViewController: ProvisioningBaseViewController {`
`135`	`135`
`136`	`136`	`ContactSupportActionSheet.present(`
`137`	`137`	`emailFilter: .deviceTransfer,`
	`138`	`+ logDumper: .fromGlobals(),`
`138`	`139`	`fromViewController: self`
`139`	`140`	`)`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ public class RegistrationNavigationController: OWSNavigationController {`
`446`	`446`
`447`	`447`	`@objc`
`448`	`448`	`private func didRequestToSubmitDebugLogs() {`
`449`		`- DebugLogs.submitLogsWithSupportTag("Registration")`
	`449`	`+ DebugLogs.submitLogs(supportTag: "Registration", dumper: .fromGlobals())`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNav`
`370`	`370`
`371`	`371`	`ContactSupportActionSheet.present(`
`372`	`372`	`emailFilter: .deviceTransfer,`
	`373`	`+ logDumper: .fromGlobals(),`
`373`	`374`	`fromViewController: self`
`374`	`375`	`)`
`375`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ final class ContactSupportViewController: OWSTableViewController2 {`
`254`	`254`	`var emailRequest = SupportEmailModel()`
`255`	`255`	`emailRequest.userDescription = descriptionField.text`
`256`	`256`	`emailRequest.emojiMood = emojiPicker.selectedMood`
`257`		`- emailRequest.debugLogPolicy = debugSwitch.isOn ? .attemptUpload : .none`
	`257`	`+ emailRequest.debugLogPolicy = debugSwitch.isOn ? .attemptUpload(.fromGlobals()) : .none`
`258`	`258`	`if let selectedFilter = selectedFilter {`
`259`	`259`	`emailRequest.supportFilter = "iOS \(selectedFilter.emailFilterString)"`
`260`	`260`	`}`