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

Fixed printing on some devices

Browse Source
This commit is contained in:
M66B
2019-04-06 11:05:33 +02:00
parent 6b2591ce32
commit ca0765bb9d
3 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,8 +42,10 @@ import org.jsoup.safety.Whitelist;
import org.jsoup.select.NodeTraversor;
import org.jsoup.select.NodeVisitor;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -547,7 +549,38 @@ public class HtmlHelper {
return sb.toString();
}
static boolean isTrackingPixel(Element img) {
static String getHtmlEmbedded(Context context, long id, String html) throws IOException {
DB db = DB.getInstance(context);
Document doc = Jsoup.parse(html);
for (Element img : doc.select("img")) {
String src = img.attr("src");
if (src.startsWith("cid:")) {
String cid = '<' + src.substring(4) + '>';
EntityAttachment attachment = db.attachment().getAttachment(id, cid);
if (attachment != null && attachment.available) {
File file = attachment.getFile(context);
try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
byte[] bytes = new byte[(int) file.length()];
if (is.read(bytes) != bytes.length)
throw new IOException("length");
StringBuilder sb = new StringBuilder();
sb.append("data:");
sb.append(attachment.type);
sb.append(";base64,");
sb.append(Base64.encodeToString(bytes, Base64.DEFAULT));
img.attr("src", sb.toString());
}
}
}
}
return doc.html();
}
private static boolean isTrackingPixel(Element img) {
String src = img.attr("src");
String width = img.attr("width").trim();
String height = img.attr("height").trim();
@@ -564,7 +597,7 @@ public class HtmlHelper {
}
}
static void trimEnd(StringBuilder sb) {
private static void trimEnd(StringBuilder sb) {
int length = sb.length();
while (length > 0 && sb.charAt(length - 1) == ' ')
length--;