Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 01:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use disconnect list for tracking images

Browse Source
This commit is contained in:
M66B
2020-07-19 19:36:32 +02:00
parent 8f482a95fe
commit 46374b3f34
6 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@@ -1412,6 +1412,9 @@ public class HtmlHelper {
}
static void removeTrackingPixels(Context context, Document document) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean disconnect_images = prefs.getBoolean("disconnect_images", false);
Drawable d = ContextCompat.getDrawable(context, R.drawable.baseline_my_location_24);
d.setTint(Helper.resolveColor(context, R.attr.colorWarning));
@@ -1427,33 +1430,20 @@ public class HtmlHelper {
sb.append("data:image/png;base64,");
sb.append(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP));
// Build list of allowed hosts
List<String> hosts = new ArrayList<>();
//for (Element img : document.select("img")) {
// String src = img.attr("src");
// if (!TextUtils.isEmpty(src) && !isTrackingPixel(img)) {
// Uri uri = Uri.parse(img.attr("src"));
// String host = uri.getHost();
// if (host != null && !hosts.contains(host))
// hosts.add(host);
// }
//}
// Images
for (Element img : document.select("img")) {
img.removeAttr("x-tracking");
String src = img.attr("src");
if (!TextUtils.isEmpty(src) && isTrackingPixel(img)) {
Uri uri = Uri.parse(src);
String host = uri.getHost();
if (host != null && !hosts.contains(host)) {
img.attr("src", sb.toString());
img.attr("alt", context.getString(R.string.title_legend_tracking_pixel));
img.attr("height", "24");
img.attr("width", "24");
img.attr("style", "display:block !important; width:24px !important; height:24px !important;");
img.attr("x-tracking", src);
}
if (TextUtils.isEmpty(src))
continue;
if (isTrackingPixel(img) ||
(disconnect_images && DisconnectBlacklist.isTracking(Uri.parse(src).getHost()))) {
img.attr("src", sb.toString());
img.attr("alt", context.getString(R.string.title_legend_tracking_pixel));
img.attr("height", "24");
img.attr("width", "24");
img.attr("style", "display:block !important; width:24px !important; height:24px !important;");
img.attr("x-tracking", src);
}
}
}