fix(file-provider): Resolved circular object initializer dependency.

- Moved some logic (most notably removeOrphanedDomains and restoreMissingDomains) from FileProviderDomainManager into the more appropriate FileProviderSettingsController
- Dissolved updateFileProviderDomains()
- Removed domainSetupComplete signal
- Introduced migrateToAppSandbox() implementation FileProviderSettingsController
- Improved logging messages

Signed-off-by: Iva Horn <[email protected]>

Author: i2h3

src/gui/macOS/fileprovider.h

@@ -28,13 +28,11 @@ class FileProvider : public QObject
     static FileProvider *instance();
     ~FileProvider() override;
 
+    void configureXPC();
     [[nodiscard]] FileProviderXPC *xpc() const;
     [[nodiscard]] FileProviderDomainManager *domainManager() const;
     [[nodiscard]] FileProviderSocketServer *socketServer() const;
 
-private slots:
-    void configureXPC();
-
 private:
     std::unique_ptr<FileProviderDomainManager> _domainManager;
     std::unique_ptr<FileProviderSocketServer> _socketServer;

src/gui/macOS/fileprovider_mac.mm

@@ -24,17 +24,14 @@
     : QObject(parent)
 {
     Q_ASSERT(!_instance);
+    qCDebug(lcMacFileProvider) << "Initializing...";
 
-    qCInfo(lcMacFileProvider) << "Initialising file provider domain manager.";
     _domainManager = std::make_unique<FileProviderDomainManager>(this);
 
     if (_domainManager) {
-        connect(_domainManager.get(), &FileProviderDomainManager::domainSetupComplete, this, &FileProvider::configureXPC);
         _domainManager->start();
-        qCDebug(lcMacFileProvider()) << "Initialized file provider domain manager";
     }
 
-    qCDebug(lcMacFileProvider) << "Initialising file provider socket server.";
     _socketServer = std::make_unique<FileProviderSocketServer>(this);
 
     if (_socketServer) {
@@ -47,6 +44,7 @@
     if (!_instance) {
         _instance = new FileProvider();
     }
+
     return _instance;
 }
 
@@ -58,6 +56,7 @@
 void FileProvider::configureXPC()
 {
     _xpc = std::make_unique<FileProviderXPC>(new FileProviderXPC(this));
+
     if (_xpc) {
         qCInfo(lcMacFileProvider) << "Initialised file provider XPC.";
         _xpc->connectToFileProviderDomains();

src/gui/macOS/fileproviderdomainmanager.h

@@ -6,13 +6,14 @@
 #pragma once
 
 #include <QObject>
+#include <QList>
 
 #include "accountstate.h"
 
 #ifdef __OBJC__
 @class NSFileProviderDomain;
 #else
-class NSFileProviderDomain;
+struct NSFileProviderDomain;
 #endif
 
 namespace OCC {
@@ -29,28 +30,39 @@ class FileProviderDomainManager : public QObject
     explicit FileProviderDomainManager(QObject * const parent = nullptr);
     ~FileProviderDomainManager() override;
 
-    void start();
+    /**
+     * @brief Add a new file provider domain for the given account.
+     * @return The raw identifier of the added domain as a string.
+     */
+    QString addDomainForAccount(const OCC::AccountState * const accountState);
 
-    NSFileProviderDomain *domainForAccount(const OCC::Account *account) const;
+    /**
+     * @brief Remove all file provider domains managed by this application.
+     */
+    void removeAllDomains();
 
-signals:
-    void domainSetupComplete();
+    /**
+     * @brief Reconnect all file provider domains.
+     */
+    void reconnectAll();
 
-public slots:
     /**
-     * @brief Add a new file provider domain for the given account.
-     * @return The raw identifier of the added domain as a string.
+     * @brief Remove a file provider domain independent from an account.
      */
-    QString addFileProviderDomainForAccount(const OCC::AccountState * const accountState);
+    void removeDomain(NSFileProviderDomain *domain);
 
     /**
      * @brief Remove the file provider domain for the given account.
      */
-    void removeFileProviderDomainForAccount(const OCC::AccountState * const accountState);
+    void removeDomainByAccount(const OCC::AccountState * const accountState);
 
-private slots:
-    void updateFileProviderDomains();
+    void start();
 
+    [[nodiscard]] QList<NSFileProviderDomain *> getDomains() const;
+
+    NSFileProviderDomain *domainForAccount(const OCC::Account *account) const;
+
+private slots:
     void disconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState, const QString &reason);
     void reconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState);