mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 01:06:11 +00:00
Code Issues Releases Wiki Activity

SVG data URI improvements

Browse source
This commit is contained in:
M66B 2024-07-24 07:09:58 +02:00
parent 42a17c3a3d
commit e252b1bcd5
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/eu/faircode/email/ImageHelper.java
View file

@ -657,37 +657,43 @@ class ImageHelper {
// "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU" + // "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU" +
// "5ErkJggg==\" alt=\"Red dot\" />"; // "5ErkJggg==\" alt=\"Red dot\" />";
// <img src="data:image/svg;utf8,&lt;svg ...
// https://en.wikipedia.org/wiki/Data_URI_scheme // https://en.wikipedia.org/wiki/Data_URI_scheme
// https://datatracker.ietf.org/doc/html/rfc2397
try { try {
// data:[<mediatype>][;base64],<data>
int comma = source.indexOf(','); int comma = source.indexOf(',');
int colon = source.indexOf(':');
int semi = source.indexOf(';');
if (comma < 0) if (comma < 0)
throw new IllegalArgumentException("Comma missing"); throw new IllegalArgumentException("Comma missing");
int colon = source.indexOf(':');
int semi = source.indexOf(';');
String type = null; String type = null;
if (colon > 0 && semi > colon) if (colon > 0 && semi > colon)
type = source.substring(colon + 1, semi); type = source.substring(colon + 1, semi).trim();
else if (colon > 0 && comma > colon) else if (colon > 0 && comma > colon)
type = source.substring(colon + 1, comma); type = source.substring(colon + 1, comma).trim();
String enc = (semi > 0 && comma > semi ? source.substring(semi + 1, comma) : null);
String enc = (semi > 0 && comma > semi ? source.substring(semi + 1, comma).trim() : null);
if ("image/svg".equalsIgnoreCase(type) && if ("image/svg".equalsIgnoreCase(type) &&
(enc == null || "utf8".equalsIgnoreCase(enc))) (TextUtils.isEmpty(enc) /* ASCII */ || "utf8".equalsIgnoreCase(enc))) {
try { InputStream is = new ByteArrayInputStream(source.substring(comma + 1).getBytes(StandardCharsets.UTF_8));
InputStream is = new ByteArrayInputStream(source.substring(comma + 1).getBytes(StandardCharsets.UTF_8)); Bitmap bm = ImageHelper.renderSvg(is, Color.WHITE, 768);
Bitmap bm = ImageHelper.renderSvg(is, Color.WHITE, 1024); Helper.ByteArrayInOutStream s = new Helper.ByteArrayInOutStream();
Helper.ByteArrayInOutStream s = new Helper.ByteArrayInOutStream(); bm.compress(Bitmap.CompressFormat.PNG, 100, s);
bm.compress(Bitmap.CompressFormat.PNG, 100, s); return s.getInputStream();
return s.getInputStream(); }
} catch (IOException ex) {
throw new IllegalArgumentException("SVG", ex); if (!"base64".equalsIgnoreCase(enc))
} throw new IllegalArgumentException("Unknown encoding");
String base64 = source.substring(comma + 1); String base64 = source.substring(comma + 1);
byte[] bytes = Base64.decode(base64.getBytes(), 0); byte[] bytes = Base64.decode(base64.getBytes(), 0);
return new ByteArrayInputStream(bytes); return new ByteArrayInputStream(bytes);
} catch (IllegalArgumentException ex) { } catch (Throwable ex) {
String excerpt = source.substring(0, Math.min(100, source.length())); String excerpt = source.substring(0, Math.min(100, source.length()));
throw new IllegalArgumentException(excerpt, ex); throw new IllegalArgumentException(excerpt, ex);
} }