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

Handle text/html multipart

Browse Source
This commit is contained in:
M66B
2022-06-28 08:07:46 +02:00
parent c12caa410d
commit 124491015a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -3172,8 +3172,21 @@ public class MessageHelper {
result = Helper.readStream((InputStream) content,
cs == null ? StandardCharsets.ISO_8859_1 : cs);
} else {
Log.e(content.getClass().getName());
result = content.toString();
StringBuilder m = new StringBuilder();
if (content instanceof Multipart) {
m.append("multipart");
Multipart mp = (Multipart) content;
for (int i = 0; i < mp.getCount(); i++)
m.append(' ').append(mp.getBodyPart(i).getContentType());
} else
m.append(content.getClass().getName());
String msg = "Expected " + h.contentType + " got " + m;
Log.e(msg);
warnings.add(msg);
result = Helper.readStream(h.part.getInputStream(),
cs == null ? StandardCharsets.ISO_8859_1 : cs);
}
} catch (DecodingException ex) {
Log.e(ex);