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

Support data URI images with filenames

Browse Source
This commit is contained in:
M66B
2025-10-03 16:46:11 +02:00
parent 3da2792d1a
commit 7a16d86224
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/ImageHelper.java
View File

@@ -655,7 +655,7 @@ class ImageHelper {
}
static ByteArrayInputStream getDataUriStream(String source) {
// "<img src=\"data:image/png;base64,iVBORw0KGgoAAA" +
// "<img src=\"data:image/png;filename=dot.png;base64,iVBORw0KGgoAAA" +
// "ANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4" +
// "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU" +
// "5ErkJggg==\" alt=\"Red dot\" />";
@@ -667,19 +667,21 @@ class ImageHelper {
try {
// data:[<mediatype>][;base64],<data>
int comma = source.indexOf(',');
int colon = source.indexOf(':');
int semi = source.indexOf(';');
if (comma < 0)
throw new IllegalArgumentException("Comma missing");
String header = source.substring(0, comma);
int colon = header.indexOf(':');
int fsemi = header.indexOf(';');
int lsemi = header.lastIndexOf(';');
String type = null;
if (colon > 0 && semi > colon)
type = source.substring(colon + 1, semi).trim();
else if (colon > 0 && comma > colon)
if (colon > 0 && fsemi > colon)
type = source.substring(colon + 1, fsemi).trim();
else if (colon > 0)
type = source.substring(colon + 1, comma).trim();
String enc = (semi > 0 && comma > semi ? source.substring(semi + 1, comma).trim() : null);
String enc = (lsemi > 0 ? source.substring(lsemi + 1, comma).trim() : null);
if ("image/svg".equalsIgnoreCase(type) &&
(TextUtils.isEmpty(enc) /* ASCII */ || "utf8".equalsIgnoreCase(enc))) {