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

Workaround body structure issues

Browse Source
This commit is contained in:
M66B
2019-11-30 11:09:30 +01:00
parent ec365a4a9b
commit 6810391776
5 changed files with 37 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,11 @@ import com.sun.mail.util.MessageRemovedIOException;
import org.jsoup.nodes.Document;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
@@ -1231,9 +1234,34 @@ public class MessageHelper {
EntityAttachment attachment;
}
MessageParts getMessageParts() throws IOException, MessagingException {
MessageParts getMessageParts(Context context) throws IOException, MessagingException {
MessageParts parts = new MessageParts();
try {
imessage.getContentType();
} catch (MessagingException ex) {
// https://javaee.github.io/javamail/FAQ#imapserverbug
if ("Failed to load IMAP envelope".equals(ex.getMessage()) ||
"Unable to load BODYSTRUCTURE".equals(ex.getMessage())) {
Log.w("Fetching raw message");
File file = File.createTempFile("serverbug", null, context.getCacheDir());
try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
imessage.writeTo(os);
}
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
Log.w("Decoding raw message");
try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
imessage = new MimeMessageEx(isession, is, imessage);
}
file.delete();
} else
throw ex;
}
try {
if (imessage.isMimeType("multipart/signed")) {
Multipart multipart = (Multipart) imessage.getContent();
@@ -1392,18 +1420,11 @@ public class MessageHelper {
} catch (FolderClosedException ex) {
throw ex;
} catch (MessagingException ex) {
if (retryRaw(ex))
throw ex;
Log.w(ex);
parts.warnings.add(Helper.formatThrowable(ex, false));
}
}
static boolean retryRaw(MessagingException ex) {
return ("Failed to load IMAP envelope".equals(ex.getMessage()) ||
"Unable to load BODYSTRUCTURE".equals(ex.getMessage()));
}
static String sanitizeKeyword(String keyword) {
// https://tools.ietf.org/html/rfc3501
StringBuilder sb = new StringBuilder();