fix(file-provider): Actually enable or disable file provider domain in settings.

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

Author: i2h3

src/gui/macOS/fileproviderdomainmanager.h

@@ -43,10 +43,14 @@ public slots:
      */
     QString addFileProviderDomainForAccount(const OCC::AccountState * const accountState);
 
+    /**
+     * @brief Remove the file provider domain for the given account.
+     */
+    void removeFileProviderDomainForAccount(const OCC::AccountState * const accountState);
+
 private slots:
     void updateFileProviderDomains();
 
-    void removeFileProviderDomainForAccount(const OCC::AccountState * const accountState);
     void disconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState, const QString &reason);
     void reconnectFileProviderDomainForAccount(const OCC::AccountState * const accountState);
 

src/gui/macOS/fileprovidersettingscontroller_mac.mm

@@ -85,7 +85,7 @@ explicit MacImplementation(FileProviderSettingsController *const parent)
 
         const auto existingDomainId = q->fileProviderDomainIdentifierForAccount(userIdAtHost);
 
-        if (existingDomainId.isEmpty() == false) {
+        if (setEnabled && existingDomainId.isEmpty() == false) {
             qCWarning(lcFileProviderSettingsController) << "Cancelling because account already has a domain identifier!" << userIdAtHost;
             return VfsAccountsAction::VfsAccountsNoAction;
         }
@@ -94,15 +94,17 @@ explicit MacImplementation(FileProviderSettingsController *const parent)
         const auto accountState = accountManager->accountFromUserId(userIdAtHost);
 
         if (!accountState) {
-            qCWarning(lcFileProviderSettingsController) << "Unable to set file provider enablement, account not found!"
-                                                        << userIdAtHost;
+            qCWarning(lcFileProviderSettingsController) << "Unable to set file provider enablement, account not found!" << userIdAtHost;
             return VfsAccountsAction::VfsAccountsNoAction;
         }
 
-        const auto account = accountState->account();
-
-        auto const identifier = Mac::FileProvider::instance()->domainManager()->addFileProviderDomainForAccount(accountState.data());
-        accountManager->setFileProviderDomainIdentifier(userIdAtHost, identifier);
+        if (setEnabled) {
+            auto const identifier = Mac::FileProvider::instance()->domainManager()->addFileProviderDomainForAccount(accountState.data());
+            accountManager->setFileProviderDomainIdentifier(userIdAtHost, identifier);
+        } else {
+            Mac::FileProvider::instance()->domainManager()->removeFileProviderDomainForAccount(accountState.data());
+            accountManager->setFileProviderDomainIdentifier(userIdAtHost, "");
+        }
 
         return VfsAccountsAction::VfsAccountsEnabledChanged;
     }