diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index df9fb1eaf..3c94fd2b2 100644 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -541,7 +541,7 @@ void FormMain::display() { activateWindow(); // Raise alert event. Check the documentation for more info on this. - Application::alert(this); + QApplication::alert(this); } void FormMain::setupIcons() { diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp index 873ab7c88..b6a18c2bb 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp @@ -485,6 +485,14 @@ void TextBrowserViewer::onAnchorClicked(const QUrl& url) { if (open_externally_now) { qApp->web()->openUrlInExternalBrowser(resolved_url.toString()); + + if (qApp->settings() + ->value(GROUP(Messages), SETTING(Messages::BringAppToFrontAfterMessageOpenedExternally)) + .toBool()) { + QTimer::singleShot(1000, qApp, []() { + qApp->mainForm()->display(); + }); + } } else { setUrl(resolved_url); diff --git a/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp index 7add822d7..2e3fe27fc 100644 --- a/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp +++ b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp @@ -87,7 +87,9 @@ TtRssLoginResponse TtRssNetworkFactory::login(const QNetworkProxy& proxy) { QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -173,7 +175,9 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels(const QNetworkProxy& proxy QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -181,7 +185,11 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels(const QNetworkProxy& proxy QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, QNetworkAccessManager::Operation::PostOperation, - headers); + headers, + false, + {}, + {}, + proxy); TtRssGetLabelsResponse result(QString::fromUtf8(result_raw)); if (result.isNotLoggedIn()) { @@ -224,7 +232,9 @@ TtRssResponse TtRssNetworkFactory::shareToPublished(const TtRssNoteToPublish& no QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -277,7 +287,9 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories(const QN QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -337,7 +349,9 @@ TtRssGetCompactHeadlinesResponse TtRssNetworkFactory::getCompactHeadlines(int fe QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -399,7 +413,9 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getArticle(const QStringList& art QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -466,7 +482,9 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -524,7 +542,9 @@ TtRssResponse TtRssNetworkFactory::setArticleLabel(const QStringList& article_id QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -583,7 +603,9 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -647,7 +669,9 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString& QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, @@ -699,7 +723,9 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id, c QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, diff --git a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp index d14943274..239febc6f 100644 --- a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp +++ b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp @@ -391,6 +391,7 @@ void TtRssServiceRoot::updateTitle() { RootItem* TtRssServiceRoot::obtainNewTreeForSyncIn() const { TtRssGetFeedsCategoriesResponse feed_cats = m_network->getFeedsCategories(networkProxy()); TtRssGetLabelsResponse labels = m_network->getLabels(networkProxy()); + auto lst_error = m_network->lastError(); if (lst_error == QNetworkReply::NoError) {