diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index d55a699ee..78be4fecb 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -1187,7 +1187,8 @@ void Application::setupWorkHorsePool() { void Application::onAdBlockFailure() { qApp->showGuiMessage(Notification::Event::GeneralEvent, {tr("AdBlock needs to be configured"), - tr("AdBlock is not configured properly. Go to \"Settings\" -> \"Node.js\" and check " + tr("AdBlock is not configured properly or failed to start. Go to \"Settings\" -> \"Node.js\" " + "and check " "if your Node.js is properly configured."), QSystemTrayIcon::MessageIcon::Critical}, {true, true, false}); diff --git a/src/librssguard/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp index 64955ae55..33298d42c 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.cpp +++ b/src/librssguard/network-web/adblock/adblockmanager.cpp @@ -205,6 +205,8 @@ void AdBlockManager::onPackageReady(const QObject* sndr, void AdBlockManager::onPackageError(const QObject* sndr, const QList& pkgs, const QString& error) { + Q_UNUSED(sndr) + bool concerns_adblock = boolinq::from(pkgs).any([](const NodeJs::PackageMetadata& pkg) { return pkg.m_name == QSL(CLIQZ_ADBLOCKED_PACKAGE); }); @@ -362,7 +364,7 @@ void AdBlockManager::updateUnifiedFilters() { QByteArray out; auto res = NetworkFactory::performNetworkOperation(filter_list_url, - 2000, + 4000, {}, out, QNetworkAccessManager::Operation::GetOperation); diff --git a/src/librssguard/network-web/adblock/adblockmanager.h b/src/librssguard/network-web/adblock/adblockmanager.h index dbd8aad38..3b1214beb 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.h +++ b/src/librssguard/network-web/adblock/adblockmanager.h @@ -39,10 +39,8 @@ class AdBlockManager : public QObject { // and thus cannot run synchronously (when enabling) as process takes // some time to start. // - // If the process fails then signal - // processTerminated() is thrown. - // If AdBlock is switched on/off then signal - // enabledChanged(bool, QString) is thrown. + // If the process fails then signal processTerminated() is thrown. + // If AdBlock is switched on/off then signal enabledChanged(bool, QString) is thrown. void setEnabled(bool enabled); bool isEnabled() const;