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

Added Disconnect category selection

Browse Source
This commit is contained in:
M66B
2023-06-09 14:52:07 +02:00
parent 06e840747a
commit 547c5c2e77
5 changed files with 164 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,6 @@ import android.text.style.TypefaceSpan;
import android.text.style.URLSpan;
import android.text.style.UnderlineSpan;
import android.util.Base64;
import android.util.Pair;
import android.util.Patterns;
import android.view.View;
@@ -2287,7 +2286,7 @@ public class HtmlHelper {
Uri uri = Uri.parse(img.attr("src"));
String host = uri.getHost();
if (host != null && !hosts.contains(host) &&
!isTrackingHost(host, disconnect_images))
!isTrackingHost(context, host, disconnect_images))
hosts.add(host);
}
}
@@ -2305,7 +2304,7 @@ public class HtmlHelper {
if (host == null || hosts.contains(host))
continue;
if (isTrackingPixel(img) || isTrackingHost(host, disconnect_images)) {
if (isTrackingPixel(img) || isTrackingHost(context, host, disconnect_images)) {
img.attr("src", sb.toString());
img.attr("alt", context.getString(R.string.title_legend_tracking_pixel));
img.attr("height", "24");
@@ -2340,10 +2339,10 @@ public class HtmlHelper {
}
}
private static boolean isTrackingHost(String host, boolean disconnect_images) {
private static boolean isTrackingHost(Context context, String host, boolean disconnect_images) {
if (TRACKING_HOSTS.contains(host))
return true;
if (disconnect_images && DisconnectBlacklist.isTracking(host))
if (disconnect_images && DisconnectBlacklist.isTrackingImage(context, host))
return true;
return false;
}