pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some more Adblock shit.

Browse source
This commit is contained in:
Martin Rotter 2015-07-17 08:22:01 +02:00
parent d3e87de27b
commit 28676a4abd
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/text/CHANGELOG
View file

@ -1,4 +1,4 @@
<body> <head>
<style> <style>
body { body {
font-size: 150%; font-size: 150%;
@ -13,6 +13,8 @@
margin-bottom: 3px; margin-bottom: 3px;
} }
</style> </style>
</head>
<body>
<center><h2>2.5.0</h2></center> <center><h2>2.5.0</h2></center>
Added: Added:
<ul> <ul>
@ -28,8 +30,13 @@
<li><b>Fancy & modern popup notifications</b> (turned on by default).</li> <li><b>Fancy & modern popup notifications</b> (turned on by default).</li>
<li>Enhanced information in download manager.</li> <li>Enhanced information in download manager.</li>
<li>Added ability to change font for internal message viewer.</li> <li>Added ability to change font for internal message viewer.</li>
<li>Updated URLs of some Adblock subscriptions.</li>
</ul> </ul>
Fixed:
<ul>
<li>Adblock subscriptions starting with faulty " [Adblock..."] are now correctly loaded.</li>
</ul>
<hr/> <hr/>
<center><h2>2.4.2</h2></center> <center><h2>2.4.2</h2></center>
Fixed: Fixed:

16
src/network-web/adblock/adblocksubscription.cpp
View file

@ -162,7 +162,12 @@ void AdBlockSubscription::subscriptionDownloaded() {
} }
bool error = false; bool error = false;
const QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8(); QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8();
if (response.startsWith(' ')) {
// Deal with " [Adblock".
response = response.remove(0, 1);
}
if (downloader->lastOutputError() != QNetworkReply::NoError || if (downloader->lastOutputError() != QNetworkReply::NoError ||
!response.startsWith(QByteArray("[Adblock")) || !response.startsWith(QByteArray("[Adblock")) ||
@ -208,12 +213,13 @@ bool AdBlockSubscription::saveDownloadedData(const QByteArray &data) {
file.write(part2); file.write(part2);
file.flush(); file.flush();
file.close(); file.close();
return true; }
else {
file.write(data);
file.flush();
file.close();
} }
file.write(data);
file.flush();
file.close();
return true; return true;
} }