Handle situations where we might not get a manager for our desired domain in fileprov...

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

diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
index 4ee11b74dbc77890a674e341d90dfbae66b95710..c79503e9d9ad6c8f9c884ce8245a15ab21a44d53 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -296,7 +296,13 @@ class FileProviderDomainManager::Private {
         }
 
         NSFileProviderDomain * const fileProviderDomain = _registeredDomains[domainId];
+        Q_ASSERT(fileProviderDomain != nil);
+
         NSFileProviderManager * const fpManager = [NSFileProviderManager managerForDomain:fileProviderDomain];
+        if (fpManager == nil) {
+            readdFileProviderDomain(fileProviderDomain);
+            return;
+        }
 
         [fpManager disconnectWithReason:message.toNSString()
                                 options:NSFileProviderManagerDisconnectionOptionsTemporary
@@ -329,7 +335,13 @@ class FileProviderDomainManager::Private {
         }
 
         NSFileProviderDomain * const fileProviderDomain = _registeredDomains[domainId];
+        Q_ASSERT(fileProviderDomain != nil);
+
         NSFileProviderManager * const fpManager = [NSFileProviderManager managerForDomain:fileProviderDomain];
+        if (fpManager == nil) {
+            readdFileProviderDomain(fileProviderDomain);
+            return;
+        }
 
         [fpManager reconnectWithCompletionHandler:^(NSError * const error) {
             if (error) {
@@ -361,6 +373,11 @@ class FileProviderDomainManager::Private {
         Q_ASSERT(fileProviderDomain != nil);
 
         NSFileProviderManager * const fpManager = [NSFileProviderManager managerForDomain:fileProviderDomain];
+        if (fpManager == nil) {
+            readdFileProviderDomain(fileProviderDomain);
+            return;
+        }
+
         [fpManager signalEnumeratorForContainerItemIdentifier:NSFileProviderWorkingSetContainerItemIdentifier completionHandler:^(NSError * const error) {
             if (error != nil) {
                 qCDebug(lcMacFileProviderDomainManager) << "Error signalling enumerator changed for working set:"