Use new convenience method to check if push notifications ready for account in FilePr...

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 4ad17c53c638be9af53c41c694e749905ed85c8a..cf2f470a16fd7dc0f13837a4b7c80ed2dd4b0f42 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -64,6 +64,14 @@ QString accountIdFromDomain(NSFileProviderDomain * const domain)
     return accountIdFromDomainId(domain.identifier);
 }
 
+bool accountFilesPushNotificationsReady(const OCC::AccountPtr &account)
+{
+    const auto pushNotifications = account->pushNotifications();
+    const auto pushNotificationsCapability = account->capabilities().availablePushNotifications() & OCC::PushNotificationType::Files;
+
+    return pushNotificationsCapability && pushNotifications && pushNotifications->isReady();
+}
+
 }
 
 namespace OCC {
@@ -531,12 +539,10 @@ void FileProviderDomainManager::removeFileProviderDomainForAccount(const Account
 
     d->removeFileProviderDomain(accountState);
 
-    const auto pushNotifications = account->pushNotifications();
-    const auto pushNotificationsCapability = account->capabilities().availablePushNotifications() & PushNotificationType::Files;
-
-    if (pushNotificationsCapability && pushNotifications && pushNotifications->isReady()) {
+    if (accountFilesPushNotificationsReady(account)) {
+        const auto pushNotifications = account->pushNotifications();
         disconnect(pushNotifications, &PushNotifications::filesChanged, this, &FileProviderDomainManager::signalEnumeratorChanged);
-    } else if (pushNotificationsCapability) {
+    } else if (const auto hasFilesPushNotificationsCapability = account->capabilities().availablePushNotifications() & PushNotificationType::Files) {
         disconnect(account.get(), &Account::pushNotificationsReady, this, &FileProviderDomainManager::setupPushNotificationsForAccount);
     }
 }