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

Auto width/height images

This commit is contained in:
M66B 2021-08-03 08:04:40 +02:00
parent 9b23a59cde
commit f463d9fef1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1115,6 +1115,12 @@ public class HtmlHelper {
Log.i("Removing small image");
Integer width = Helper.parseInt(img.attr("width").trim());
Integer height = Helper.parseInt(img.attr("height").trim());
if (width != null && height != null) {
if (width == 0 && height != 0)
width = height;
if (width != 0 && height == 0)
height = width;
}
if ((width != null && width <= SMALL_IMAGE_SIZE) ||
(height != null && height <= SMALL_IMAGE_SIZE)) {
img.remove();
@ -1865,7 +1871,13 @@ public class HtmlHelper {
return false;
try {
return (Integer.parseInt(width) * Integer.parseInt(height) <= TRACKING_PIXEL_SURFACE);
int w = Integer.parseInt(width);
int h = Integer.parseInt(height);
if (w == 0 && h != 0)
w = h;
if (w != 0 && h == 0)
h = w;
return (w * h <= TRACKING_PIXEL_SURFACE);
} catch (NumberFormatException ignored) {
return false;
}