From 913dcd70aec44183583ed088b8b408011556b148 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 6 Feb 2024 14:04:27 +0800 Subject: [PATCH] Remove wrapper method for creating debug archive, directly use FileProviderXPC Signed-off-by: Claudio Cambra --- src/gui/macOS/fileprovider.h | 3 --- src/gui/macOS/fileprovider_mac.mm | 5 ----- src/gui/macOS/fileprovidersettingscontroller_mac.mm | 8 +++++++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gui/macOS/fileprovider.h b/src/gui/macOS/fileprovider.h index a76b29af8..58d6fcc2b 100644 --- a/src/gui/macOS/fileprovider.h +++ b/src/gui/macOS/fileprovider.h @@ -41,9 +41,6 @@ public: [[nodiscard]] FileProviderXPC *xpc() const; -public slots: - void createDebugArchiveForDomain(const QString &domainIdentifier, const QString &filename) const; - private slots: void configureXPC(); diff --git a/src/gui/macOS/fileprovider_mac.mm b/src/gui/macOS/fileprovider_mac.mm index d54608a6e..807372b1a 100644 --- a/src/gui/macOS/fileprovider_mac.mm +++ b/src/gui/macOS/fileprovider_mac.mm @@ -97,11 +97,6 @@ void FileProvider::configureXPC() } } -void FileProvider::createDebugArchiveForDomain(const QString &domainIdentifier, const QString &filename) const -{ - _xpc->createDebugArchiveForExtension(domainIdentifier, filename); -} - FileProviderXPC *FileProvider::xpc() const { return _xpc.get(); diff --git a/src/gui/macOS/fileprovidersettingscontroller_mac.mm b/src/gui/macOS/fileprovidersettingscontroller_mac.mm index 17d277e5e..4c8e3d4c4 100644 --- a/src/gui/macOS/fileprovidersettingscontroller_mac.mm +++ b/src/gui/macOS/fileprovidersettingscontroller_mac.mm @@ -437,7 +437,13 @@ void FileProviderSettingsController::createDebugArchive(const QString &userIdAtH if (filename.isEmpty()) { return; } - FileProvider::instance()->createDebugArchiveForDomain(userIdAtHost, filename); + + const auto xpc = FileProvider::instance()->xpc(); + if (!xpc) { + qCWarning(lcFileProviderSettingsController) << "Could not create debug archive, FileProviderXPC is not available."; + return; + } + xpc->createDebugArchiveForExtension(userIdAtHost, filename); } FileProviderDomainSyncStatus *FileProviderSettingsController::domainSyncStatusForAccount(const QString &userIdAtHost) const -- 2.30.2