Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akregator
Commits
d7d7d7a5
Commit
d7d7d7a5
authored
Mar 31, 2021
by
Laurent Montel
😁
Browse files
don't block resource when we open url page
parent
0d5680d8
Pipeline
#56121
passed with stage
in 14 minutes and 36 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/articleviewer-ng/webengine/articleviewerwebengine.cpp
View file @
d7d7d7a5
...
...
@@ -85,9 +85,9 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p
#ifdef HAVE_BLOCK_SUPPORT
mNetworkAccessManager
=
new
WebEngineViewer
::
InterceptorManager
(
this
,
ac
,
this
);
auto
*
e
xternalReference
=
new
WebEngineViewer
::
LoadExternalReferencesUrlInterceptor
(
this
);
mE
xternalReference
=
new
WebEngineViewer
::
LoadExternalReferencesUrlInterceptor
(
this
);
// connect(externalReference, &MessageViewer::LoadExternalReferencesUrlInterceptor::urlBlocked, this, &MailWebEngineView::urlBlocked);
mNetworkAccessManager
->
addInterceptor
(
e
xternalReference
);
mNetworkAccessManager
->
addInterceptor
(
mE
xternalReference
);
auto
*
blockTracking
=
new
WebEngineViewer
::
BlockTrackingUrlInterceptor
(
this
);
connect
(
blockTracking
,
&
WebEngineViewer
::
BlockTrackingUrlInterceptor
::
trackingFound
,
this
,
&
ArticleViewerWebEngine
::
trackingFound
);
mNetworkAccessManager
->
addInterceptor
(
blockTracking
);
...
...
src/articleviewer-ng/webengine/articleviewerwebengine.h
View file @
d7d7d7a5
...
...
@@ -18,6 +18,7 @@ namespace WebEngineViewer
class
WebHitTestResult
;
class
WebEngineAccessKey
;
class
InterceptorManager
;
class
LoadExternalReferencesUrlInterceptor
;
}
namespace
MessageViewer
{
...
...
@@ -124,6 +125,7 @@ protected:
ArticleViewerWebEnginePage
*
mPageEngine
=
nullptr
;
QList
<
QAction
*>
viewerPluginActionList
(
MessageViewer
::
ViewerPluginInterface
::
SpecificFeatureTypes
features
);
WebEngineViewer
::
InterceptorManager
*
mNetworkAccessManager
=
nullptr
;
WebEngineViewer
::
LoadExternalReferencesUrlInterceptor
*
mExternalReference
=
nullptr
;
private:
void
openSafeUrl
(
const
QUrl
&
url
);
...
...
src/frame/webengine/akrwebengineviewer.cpp
View file @
d7d7d7a5
...
...
@@ -21,6 +21,7 @@
#include <QWebEngineHistory>
#include <QWebEngineSettings>
#include <WebEngineViewer/InterceptorManager>
#include <WebEngineViewer/LoadExternalReferencesUrlInterceptor>
#include <WebEngineViewer/WebHitTest>
#include <WebEngineViewer/WebHitTestResult>
...
...
@@ -29,6 +30,9 @@ using namespace Akregator;
AkrWebEngineViewer
::
AkrWebEngineViewer
(
KActionCollection
*
ac
,
QWidget
*
parent
)
:
ArticleViewerWebEngine
(
ac
,
parent
)
{
if
(
mExternalReference
)
{
mExternalReference
->
setAllowExternalContent
(
true
);
}
// TODO update settings when we change config
settings
()
->
setAttribute
(
QWebEngineSettings
::
JavascriptEnabled
,
Settings
::
enableJavascript
());
settings
()
->
setAttribute
(
QWebEngineSettings
::
PluginsEnabled
,
false
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment