From 04559c5b096164348b58cc1eb576bb0276ad76b6 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 14 Aug 2020 08:06:32 +0200 Subject: [PATCH] Fix percent encoding in enclosures. --- src/librssguard/gui/webviewer.cpp | 2 ++ src/librssguard/miscellaneous/application.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index 695fd4bf5..5779c7ba9 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -108,6 +108,8 @@ void WebViewer::loadMessages(const QList& messages, RootItem* root) { enc_url = enclosure.m_url; } + enc_url = QUrl::fromPercentEncoding(enc_url.toUtf8()); + enclosures += skin.m_enclosureMarkup.arg(enc_url, tr("Attachment"), enclosure.m_mimeType); diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 6d7a027f6..0d4e11522 100755 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -83,7 +83,12 @@ Application::Application(const QString& id, int& argc, char** argv) connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &Application::downloadRequested); +#if QT_VERSION >= 0x050D00 // Qt >= 5.13.0 + QWebEngineProfile::defaultProfile()->setUrlRequestInterceptor(m_urlInterceptor); +#else QWebEngineProfile::defaultProfile()->setRequestInterceptor(m_urlInterceptor); +#endif + m_urlInterceptor->loadSettings(); QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(QByteArray(APP_LOW_NAME),