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

Don't do a connection checks when using push notifications
This commit is contained in:
Matthieu Gallien 2021-11-04 21:49:28 +01:00 committed by GitHub
commit 7dd09b8d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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();
}
}