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

Split parent link and linked image

Browse Source
This commit is contained in:
M66B
2019-03-13 09:35:33 +00:00
parent b27f43aa48
commit 1a75a70889
2 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,50 +183,36 @@ public class HtmlHelper {
// Images
for (Element img : document.select("img")) {
// Get image attributes
String src = img.attr("src");
String alt = img.attr("alt");
String title = img.attr("title");
boolean tracking = isTrackingPixel(img);
// Create image container
Element div = document.createElement("div");
Uri uri = Uri.parse(src);
if ("http".equals(uri.getScheme()) || "https".equals(uri.getScheme())) {
// Remove link tracking pixel
if (tracking)
img.removeAttr("src");
// Remove link tracking pixel
if (tracking)
img.removeAttr("src");
boolean linked = false;
for (Element parent : img.parents())
if ("a".equals(parent.tagName())) {
if (TextUtils.isEmpty(parent.attr("href")))
parent.attr("href", uri.toString());
linked = true;
break;
}
if (linked)
div.appendChild(img.clone());
else {
Element a = document.createElement("a");
a.attr("href", uri.toString());
a.appendChild(img.clone());
div.appendChild(a);
}
} else
div.appendChild(img.clone());
// Link image to source
Element a = document.createElement("a");
a.attr("href", src);
a.appendChild(img.clone());
div.appendChild(a);
// Show image title
if (!TextUtils.isEmpty(title)) {
div.appendElement("br");
div.appendElement("em").text(title);
}
if (!TextUtils.isEmpty(alt)) {
div.appendElement("br");
div.appendElement("em").text(alt);
}
if (!TextUtils.isEmpty(title) && !title.equals(alt)) {
div.appendElement("br");
div.appendElement("em").text(title);
}
// Tracking pixel
// Show when tracking pixel
if (tracking) {
div.appendElement("br");
div.appendElement("strong").text(
@@ -234,7 +220,30 @@ public class HtmlHelper {
img.attr("width"), img.attr("height")));
}
img.replaceWith(div);
// Split parent link and linked image
boolean linked = false;
for (Element parent : img.parents())
if ("a".equals(parent.tagName()) && !TextUtils.isEmpty(parent.attr("href"))) {
String text = parent.attr("title").trim();
if (TextUtils.isEmpty(text))
text = parent.attr("alt").trim();
if (TextUtils.isEmpty(text))
text = context.getString(R.string.title_hint_image_link);
img.remove();
parent.appendText(text);
Element span = document.createElement("span");
span.appendChild(parent.clone());
span.appendChild(div);
parent.replaceWith(span);
linked = true;
break;
}
if (!linked)
img.replaceWith(div);
}
// Autolink