mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Workaround double encoded subjects

This commit is contained in:
M66B 2019-01-01 14:58:51 +01:00
parent 778c71cdf1
commit 47fed9180b
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeUtility;
import javax.mail.internet.ParseException;
public class MessageHelper {
@ -435,6 +436,19 @@ public class MessageHelper {
return null;
}
String getSubject() throws MessagingException, UnsupportedEncodingException {
String subject = imessage.getSubject();
if (subject != null && subject.indexOf("=?") >= 0) {
String prev;
do {
prev = subject;
subject = MimeUtility.decodeText(subject);
}
while (!subject.equals(prev));
}
return subject;
}
Integer getSize() throws MessagingException {
int size = imessage.getSize();
return (size < 0 ? null : size);

2
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -2379,7 +2379,7 @@ public class ServiceSynchronize extends LifecycleService {
message.cc = helper.getCc();
message.bcc = helper.getBcc();
message.reply = helper.getReply();
message.subject = imessage.getSubject();
message.subject = helper.getSubject();
message.size = helper.getSize();
message.content = false;
message.received = imessage.getReceivedDate().getTime();