Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

AdBlock: Don't block user triggered network requests

Browse Source 
Disable AdBlock when user tries to load the url from locationbar,
clicking on link, opening new tab, ...
Only block web content not explicitly requested by user - images,
scripts, redirects, ...
This commit is contained in:
David Rosca 2014-10-13 16:59:37 +02:00
parent a61e3ff0ad
commit 26f466ed0d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/network/networkmanager.cpp
View File

@ -563,7 +563,10 @@ QNetworkReply* NetworkManager::createRequest(QNetworkAccessManager::Operation op
return reply; return reply;
} }
if (req.rawHeader("X-QupZilla-UserLoadAction") == QByteArray("1")) { // Indicates whether the load action was triggered by user (eg. opening new tab, clicking on link, ...)
bool userLoadAction = req.rawHeader("X-QupZilla-UserLoadAction") == QByteArray("1");
if (userLoadAction) {
req.setRawHeader("X-QupZilla-UserLoadAction", QByteArray()); req.setRawHeader("X-QupZilla-UserLoadAction", QByteArray());
req.setAttribute(QNetworkRequest::Attribute(QNetworkRequest::User + 151), QString()); req.setAttribute(QNetworkRequest::Attribute(QNetworkRequest::User + 151), QString());
} }
@ -585,7 +588,7 @@ QNetworkReply* NetworkManager::createRequest(QNetworkAccessManager::Operation op
//req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); //req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
// Adblock // Adblock
if (op == QNetworkAccessManager::GetOperation) { if (!userLoadAction && op == QNetworkAccessManager::GetOperation) {
if (!m_adblockManager) { if (!m_adblockManager) {
m_adblockManager = AdBlockManager::instance(); m_adblockManager = AdBlockManager::instance();
} }

6
src/lib/webkit/webview.cpp
View File

@ -587,7 +587,10 @@ void WebView::savePageAs()
void WebView::openUrlInNewTab(const QUrl &url, Qz::NewTabPositionFlags position) void WebView::openUrlInNewTab(const QUrl &url, Qz::NewTabPositionFlags position)
{ {
loadInNewTab(url, position); QNetworkRequest request(url);
request.setRawHeader("X-QupZilla-UserLoadAction", QByteArray("1"));
loadInNewTab(request, position);
} }
void WebView::downloadUrlToDisk() void WebView::downloadUrlToDisk()
@ -711,7 +714,6 @@ void WebView::userDefinedOpenUrlInNewTab(const QUrl &url, bool invert)
else { else {
position &= ~Qz::NT_NotSelectedTab; position &= ~Qz::NT_NotSelectedTab;
position |= Qz::NT_SelectedTab; position |= Qz::NT_SelectedTab;
} }
} }