From ad265dfbd6d94414a2ca451d0c54152d89895717 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 31 May 2021 09:33:46 +0200 Subject: [PATCH] fix #422, therefore do not use specific base URL for message preview --- src/librssguard/gui/webviewer.cpp | 4 +--- src/librssguard/network-web/webpage.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index 55fbc9dc6..f95a0378f 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -53,9 +53,7 @@ WebPage* WebViewer::page() const { } void WebViewer::displayMessage() { - setContent(m_messageContents.toUtf8(), "text/html", QUrl::fromUserInput(INTERNAL_URL_MESSAGE)); - - //setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE)); + setHtml(m_messageContents /*, QUrl::fromUserInput(INTERNAL_URL_MESSAGE)*/); } bool WebViewer::increaseWebPageZoom() { diff --git a/src/librssguard/network-web/webpage.cpp b/src/librssguard/network-web/webpage.cpp index 4202604b0..d79409850 100644 --- a/src/librssguard/network-web/webpage.cpp +++ b/src/librssguard/network-web/webpage.cpp @@ -62,13 +62,14 @@ bool WebPage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool return false; } - if (url.host() == INTERNAL_URL_MESSAGE_HOST) { - setHtml(view()->messageContents(), QUrl(INTERNAL_URL_MESSAGE)); - return true; - } - else { - return QWebEnginePage::acceptNavigationRequest(url, type, is_main_frame); - } + /*if (url.host() == INTERNAL_URL_MESSAGE_HOST) { + setHtml(view()->messageContents(), QUrl(INTERNAL_URL_MESSAGE)); + return true; + } + else {*/ + return QWebEnginePage::acceptNavigationRequest(url, type, is_main_frame); + + //} } void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message,