Enable file provider domains per the settings in the file provider do…

…main manager Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Sep 6, 2023 · 6129b80 · 6129b80
1 parent d008f22
commit 6129b80
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "fileproviderdomainmanager.h"
+#include "fileprovidersettingscontroller.h"
 #include "pushnotifications.h"
 
 #include "gui/accountmanager.h"
@@ -380,7 +381,8 @@ void signalEnumeratorChanged(const Account * const account)
         }
     }
 
-    QStringList configuredDomainIds() const {
+    QStringList configuredDomainIds() const
+    {
         return _registeredDomains.keys();
     }
 
@@ -431,9 +433,20 @@ QStringList configuredDomainIds() const {
 
     d->findExistingFileProviderDomains();
 
-    for(auto &accountState : AccountManager::instance()->accounts()) {
+    const auto vfsEnabledAccounts = FileProviderSettingsController::instance()->vfsEnabledAccounts();
+    auto domainsToRemove = d->configuredDomainIds();
+
+    for (const auto &accountUserIdAtHost : vfsEnabledAccounts) {
+        domainsToRemove.removeAll(accountUserIdAtHost);
+
+        const auto accountState = AccountManager::instance()->accountFromUserId(accountUserIdAtHost);
         addFileProviderDomainForAccount(accountState.data());
     }
+
+    for (const auto &remainingDomainUserId : domainsToRemove) {
+        const auto accountState = AccountManager::instance()->accountFromUserId(remainingDomainUserId);
+        removeFileProviderDomainForAccount(accountState.data());
+    }
 }
 
 void FileProviderDomainManager::addFileProviderDomainForAccount(const AccountState * const accountState)

diff --git a/src/gui/macOS/fileprovidersettingscontroller.h b/src/gui/macOS/fileprovidersettingscontroller.h
@@ -32,6 +32,7 @@ class FileProviderSettingsController : public QObject
                                                    QWidget *const parent = nullptr,
                                                    const QQuickWidget::ResizeMode resizeMode = QQuickWidget::SizeRootObjectToView);
 
+    [[nodiscard]] QStringList vfsEnabledAccounts() const;
     [[nodiscard]] Q_INVOKABLE bool vfsEnabledForAccount(const QString &userIdAtHost) const;
 
 public slots:

diff --git a/src/gui/macOS/fileprovidersettingscontroller_mac.mm b/src/gui/macOS/fileprovidersettingscontroller_mac.mm
@@ -183,6 +183,11 @@ void initialCheck()
     return settingsViewWidget;
 }
 
+QStringList FileProviderSettingsController::vfsEnabledAccounts() const
+{
+    return d->enabledAccounts();
+}
+
 bool FileProviderSettingsController::vfsEnabledForAccount(const QString &userIdAtHost) const
 {
     return d->vfsEnabledForAccount(userIdAtHost);