fix(file-provider): Rediscover XPC service for restored (previously missing) domain

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>

Author: claucambra

src/gui/macOS/fileprovidersettingscontroller_mac.mm

@@ -30,6 +30,11 @@
 // NSUserDefaults entries
 constexpr auto enabledAccountsSettingsKey = "enabledAccounts";
 
+bool domainRestorationRequiresXpcReconfiguration(const QString &storedIdentifier, const QString &restoredIdentifier)
+{
+    return !storedIdentifier.isEmpty() && !restoredIdentifier.isEmpty() && storedIdentifier != restoredIdentifier;
+}
+
 } // namespace
 
 namespace OCC {
@@ -265,6 +270,7 @@ void ensureDomainConfigurationMatchesMode()
         if (modeEnabled) {
             const auto domains = Mac::FileProvider::instance()->domainManager()->getDomains();
             QSet<QString> existingDomainIdentifiers;
+            auto restoredDomain = false;
 
             for (NSFileProviderDomain * const domain : domains) {
                 existingDomainIdentifiers.insert(QString::fromNSString(domain.identifier));
@@ -293,9 +299,15 @@ void ensureDomainConfigurationMatchesMode()
 
                     if (newIdentifier.isEmpty() == false) {
                         AccountManager::instance()->setFileProviderDomainIdentifier(userIdAtHost, newIdentifier);
+                        restoredDomain |= domainRestorationRequiresXpcReconfiguration(identifier, newIdentifier);
                     }
                 }
             }
+
+            if (restoredDomain) {
+                // A changed identifier means addDomainForAccount() registered a new domain; rediscover its XPC service.
+                Mac::FileProvider::instance()->configureXPC();
+            }
         } else {
             for (const auto &accountState : accountStates) {
                 const auto account = accountState->account();