Merge pull request #3948 from nextcloud/bugfix/pn-connection-check

Don't do a connection checks when using push notifications
nextcloud · Nov 4, 2021 · 7dd09b8 · 7dd09b8
2 parents d11935b + d661e91
commit 7dd09b8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -34,6 +34,7 @@
 #include "sharedialog.h"
 #include "accountmanager.h"
 #include "creds/abstractcredentials.h"
+#include "pushnotifications.h"
 
 #if defined(BUILD_UPDATER)
 #include "updater/ocupdater.h"
@@ -459,9 +460,10 @@ void Application::slotCheckConnection()
 
         // Don't check if we're manually signed out or
         // when the error is permanent.
-        if (state != AccountState::SignedOut
-            && state != AccountState::ConfigurationError
-            && state != AccountState::AskingCredentials) {
+        const auto pushNotifications = accountState->account()->pushNotifications();
+        const auto pushNotificationsAvailable = (pushNotifications && pushNotifications->isReady());
+        if (state != AccountState::SignedOut && state != AccountState::ConfigurationError
+            && state != AccountState::AskingCredentials && !pushNotificationsAvailable) {
             accountState->checkConnectivity();
         }
     }