Merge pull request #9008 from nextcloud/bugfix/8990/vfs-status-mapping

fix(file-provider): use correct FP domain identifier for sync status check

Author: nilsding

src/gui/macOS/fileproviderdomainmanager.h

@@ -24,7 +24,7 @@ class FileProviderDomainManager : public QObject
     ~FileProviderDomainManager() override;
 
     static AccountStatePtr accountStateFromFileProviderDomainIdentifier(const QString &domainIdentifier);
-    static QString fileProviderDomainIdentifierFromAccountState(const AccountStatePtr &accountState);
+    QString fileProviderDomainIdentifierFromAccountId(const QString &accountId);
 
     void start();
     void* domainForAccount(const OCC::AccountState * const accountState);

src/gui/macOS/fileproviderdomainmanager_mac.mm

@@ -308,6 +308,18 @@ void findExistingFileProviderDomains()
         return nil;
     }
 
+    QString fileProviderDomainIdentifierForAccountId(const QString &accountId)
+    {
+        if (@available(macOS 11.0, *)) {
+            if (_registeredDomains.contains(accountId)) {
+                const auto fileProviderDomain = _registeredDomains[accountId];
+                return QString::fromNSString([fileProviderDomain identifier]);
+            }
+        }
+
+        return {};
+    }
+
     void addFileProviderDomain(const AccountState * const accountState)
     {
         if (@available(macOS 11.0, *)) {
@@ -597,6 +609,7 @@ QStringList getAccountIdsOfFoundFileProviderDomains() const
     }
 
 private:
+    //! keys are accountId, i.e. userIdAtHostWithPort
     QHash<QString, NSFileProviderDomain*> _registeredDomains;
 };
 
@@ -806,9 +819,13 @@ QStringList getAccountIdsOfFoundFileProviderDomains() const
     return accountForReceivedDomainIdentifier;
 }
 
-QString FileProviderDomainManager::fileProviderDomainIdentifierFromAccountState(const AccountStatePtr &accountState)
+QString FileProviderDomainManager::fileProviderDomainIdentifierFromAccountId(const QString &accountId)
 {
-    return uuidDomainIdentifierForAccount(accountState->account());
+    if (!d || accountId.isEmpty()) {
+        return {};
+    }
+
+    return d->fileProviderDomainIdentifierForAccountId(accountId);
 }
 
 void* FileProviderDomainManager::domainForAccount(const AccountState * const accountState)

src/gui/macOS/fileproviderxpc.h

@@ -43,7 +43,9 @@ private slots:
     void slotAccountStateChanged(AccountState::State state) const;
 
 private:
+    //! keys are File Provider domain identifiers
     QHash<QString, void*> _clientCommServices;
+    //! keys are File Provider domain identifiers
     QHash<QString, QDateTime> _unreachableFileProviderDomains;
 };
 

src/gui/owncloudgui.cpp

@@ -318,7 +318,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
             }
             allPaused = false;
             const auto fileProvider = Mac::FileProvider::instance();
-            const auto accountFpId = Mac::FileProviderDomainManager::fileProviderDomainIdentifierFromAccountState(accountState);
+            const auto accountFpId = fileProvider->domainManager()->fileProviderDomainIdentifierFromAccountId(userIdAtHostWithPort);
             const auto displayName = account->displayName();
             const auto accountTooltipLabel = displayName.isEmpty() ? userIdAtHostWithPort : displayName;