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

Small improvements

Browse Source
This commit is contained in:
M66B
2019-10-05 11:57:54 +02:00
parent ad9199df68
commit 90fd7b440f
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,7 +371,9 @@ public class HtmlHelper {
if (width != 0 || height != 0) {
String src = img.attr("src");
ImageHelper.AnnotatedSource a = new ImageHelper.AnnotatedSource(src, width, height);
String tracking = img.attr("tracking");
ImageHelper.AnnotatedSource a = new ImageHelper.AnnotatedSource(
src, width, height, "true".equals(tracking));
img.attr("src", a.getAnnotated());
}
}
@@ -489,7 +491,7 @@ public class HtmlHelper {
StringBuilder sb = new StringBuilder();
sb.append("data:image/png;base64,");
sb.append(Base64.encodeToString(bos.toByteArray(), Base64.DEFAULT));
sb.append(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP));
// Build list of allowed hosts
List<String> hosts = new ArrayList<>();
@@ -505,6 +507,7 @@ public class HtmlHelper {
// Images
for (Element img : document.select("img")) {
img.removeAttr("tracking");
String src = img.attr("src");
if (!TextUtils.isEmpty(src) && isTrackingPixel(img)) {
Uri uri = Uri.parse(img.attr("src"));
@@ -514,7 +517,8 @@ public class HtmlHelper {
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;");
img.attr("style", "display:block !important; width:24px !important; height:24px !important;");
img.attr("tracking", "true");
}
}
}
@@ -534,7 +538,7 @@ public class HtmlHelper {
}
}
static void embedImages(Context context, long id, Document document) throws IOException {
static void embedInlineImages(Context context, long id, Document document) throws IOException {
DB db = DB.getInstance(context);
for (Element img : document.select("img")) {
String src = img.attr("src");
@@ -552,7 +556,7 @@ public class HtmlHelper {
sb.append("data:");
sb.append(attachment.type);
sb.append(";base64,");
sb.append(Base64.encodeToString(bytes, Base64.DEFAULT));
sb.append(Base64.encodeToString(bytes, Base64.NO_WRAP));
img.attr("src", sb.toString());
}