mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove spacer images

This commit is contained in:
M66B 2020-08-06 19:00:11 +02:00
parent c78a78416b
commit 7500e11a26
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -1000,6 +1000,20 @@ public class Helper {
return true;
}
static Integer parseInt(String text) {
if (TextUtils.isEmpty(text))
return null;
if (!TextUtils.isDigitsOnly(text))
return null;
try {
return Integer.parseInt(text);
} catch (NumberFormatException ignored) {
return null;
}
}
// Files
static String sanitizeFilename(String name) {

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

@ -130,6 +130,7 @@ public class HtmlHelper {
private static final int MAX_AUTO_LINK = 250;
private static final int MAX_FORMAT_TEXT_SIZE = 200 * 1024; // characters
private static final int MAX_FULL_TEXT_SIZE = 1024 * 1024; // characters
private static final int SMALL_IMAGE_SIZE = 5; // pixels
private static final int TRACKING_PIXEL_SURFACE = 25; // pixels
private static final float[] HEADING_SIZES = {1.5f, 1.4f, 1.3f, 1.2f, 1.1f, 1f};
private static final String LINE = "----------------------------------------";
@ -1472,8 +1473,15 @@ public class HtmlHelper {
Uri uri = Uri.parse(src);
String host = uri.getHost();
if (host == null || hosts.contains(host)) {
if (!full && isTrackingPixel(img)) // Is small image
img.remove();
if (!full) {
// Remove spacer, etc
Integer width = Helper.parseInt(img.attr("width").trim());
Integer height = Helper.parseInt(img.attr("height").trim());
if ((width != null && width <= SMALL_IMAGE_SIZE) ||
(height != null && height <= SMALL_IMAGE_SIZE))
img.remove();
}
continue;
}