mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-20 02:45:30 +00:00
Code Issues Releases Wiki Activity

Revert "Refactoring"

Browse source 
This reverts commit 8babc79a03.
This commit is contained in:
M66B 2020-10-30 18:48:53 +01:00
parent 8babc79a03
commit 7750cddce2
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/HtmlHelper.java
View file

@ -1491,7 +1491,7 @@ public class HtmlHelper {
List<String> hosts = new ArrayList<>();
for (Element img : document.select("img")) {
String src = img.attr("src");
if (!TextUtils.isEmpty(src) && !isTrackingPixel(img, disconnect_images)) {
if (!TextUtils.isEmpty(src) && !isTrackingPixel(img)) {
Uri uri = Uri.parse(img.attr("src"));
String host = uri.getHost();
if (host != null && !hosts.contains(host))
@ -1525,7 +1525,8 @@ public class HtmlHelper {
continue;
}
if (isTrackingPixel(img, disconnect_images)) {
if (isTrackingPixel(img) ||
(disconnect_images && DisconnectBlacklist.isTracking(host))) {
img.attr("src", sb.toString());
img.attr("alt", context.getString(R.string.title_legend_tracking_pixel));
img.attr("height", "24");
@ -1536,19 +1537,14 @@ public class HtmlHelper {
}
}
private static boolean isTrackingPixel(Element img, boolean disconnect_images) {
private static boolean isTrackingPixel(Element img) {
String src = img.attr("src");
if (!TextUtils.isEmpty(src))
try {
Uri uri = Uri.parse(src);
String host = uri.getHost();
if (!TextUtils.isEmpty(host)) {
if (TRACKING_HOSTS.contains(host))
return true;
if (disconnect_images &&
DisconnectBlacklist.isTracking(host))
return true;
}
if (!TextUtils.isEmpty(host) && TRACKING_HOSTS.contains(host))
return true;
} catch (Throwable ex) {
Log.w(ex);
}