Remove wrapper method for creating debug archive, directly use FileProviderXPC

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/fileprovider.h b/src/gui/macOS/fileprovider.h
index a76b29af8c4e4077e26863e1691eef2bcc563818..58d6fcc2bdfe8913ca572a955461bf27993c2cb3 100644 (file)
--- 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 d54608a6e41a6ef71bfe4eab06dd8babd7572bcf..807372b1acf658722115c9a6a4ed892cb033dd61 100644 (file)
--- 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 17d277e5ef1a6d68f6317d3896605fe89b65a37f..4c8e3d4c4022ede4f6ceda60d0012f25cc6a68b9 100644 (file)
--- 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