From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 2 Feb 2023 12:11:48 +0000 (+0100)
Subject: Remove setting connection status from fileproviderdomainmanager, this will be handled... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~96^2^2~55^2~234
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f12d9b2bd7f02f548035a297a116987158197f9;p=nextcloud-desktop.git

Remove setting connection status from fileproviderdomainmanager, this will be handled by the domain

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

diff --git a/src/gui/macOS/fileproviderdomainmanager.h b/src/gui/macOS/fileproviderdomainmanager.h
index a788bf8dd..8c5544d62 100644
--- a/src/gui/macOS/fileproviderdomainmanager.h
+++ b/src/gui/macOS/fileproviderdomainmanager.h
@@ -35,7 +35,6 @@ private slots:
 
     void addFileProviderDomainForAccount(OCC::AccountState *accountState);
     void removeFileProviderDomainForAccount(OCC::AccountState *accountState);
-    void setFileProviderForAccountIsConnected(OCC::AccountState *accountState);
 
 private:
     explicit FileProviderDomainManager(QObject *parent = nullptr);
diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
index 2249ecab7..647837693 100644
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -126,50 +126,6 @@ class FileProviderDomainManager::Private {
         }];
     }
 
-    void setFileProviderDomainConnected(const AccountState *accountState)
-    {
-        const QString accountDisplayName = accountState->account()->displayName();
-        const QString accountId = accountState->account()->id();
-        const bool accountIsConnected = accountState->isConnected();
-
-        qCDebug(lcMacFileProviderDomainManager) << "Account state for account changed: "
-                                                << accountDisplayName
-                                                << accountIsConnected;
-
-        if(!_registeredDomains.contains(accountId)) {
-            qCDebug(lcMacFileProviderDomainManager) << "File provider domain not found for id: " << accountId;
-            return;
-        }
-
-        NSFileProviderDomain* accountDomain = _registeredDomains.value(accountId);
-        NSFileProviderManager* providerManager = [NSFileProviderManager managerForDomain:accountDomain];
-
-        if(accountIsConnected) {
-            [providerManager reconnectWithCompletionHandler:^(NSError *error) {
-                if(error) {
-                    qCDebug(lcMacFileProviderDomainManager) << "Error reconnecting file provider domain: "
-                                                            << accountDisplayName
-                                                            << [error code]
-                                                            << [error localizedDescription];
-                }
-            }];
-        } else {
-            NSString* reason = @"Nextcloud account disconnected.";
-            const auto isTemporary = accountState->state() != AccountState::SignedOut &&
-                                     accountState->state() != AccountState::ConfigurationError;
-            NSFileProviderManagerDisconnectionOptions disconnectOption = isTemporary ? 0 : NSFileProviderManagerDisconnectionOptionsTemporary;
-
-            [providerManager disconnectWithReason:reason options:disconnectOption completionHandler:^(NSError *error) {
-                if(error) {
-                    qCDebug(lcMacFileProviderDomainManager) << "Error disconnecting file provider domain: "
-                                               << accountDisplayName
-                                               << [error code]
-                                               << [error localizedDescription];
-                }
-            }];
-        }
-    }
-
 private:
     QHash<QString, NSFileProviderDomain*> _registeredDomains;
 };
@@ -211,9 +167,6 @@ void FileProviderDomainManager::setupFileProviderDomains()
 void FileProviderDomainManager::addFileProviderDomainForAccount(AccountState *accountState)
 {
     d->addFileProviderDomain(accountState);
-
-    connect(accountState, &AccountState::isConnectedChanged,
-            this, [this, accountState]{ setFileProviderForAccountIsConnected(accountState); });
 }
 
 void FileProviderDomainManager::removeFileProviderDomainForAccount(AccountState* accountState)
@@ -221,11 +174,6 @@ void FileProviderDomainManager::removeFileProviderDomainForAccount(AccountState*
     d->removeFileProviderDomain(accountState);
 }
 
-void FileProviderDomainManager::setFileProviderForAccountIsConnected(AccountState *accountState)
-{
-    d->setFileProviderDomainConnected(accountState);
-}
-
 } // namespace Mac
 
 } // namespace OCC