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

Refactoring

This commit is contained in:
M66B 2024-05-24 08:12:45 +02:00
parent c9fbc5707e
commit 420d78efeb
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2203,6 +2203,38 @@ public class MessageHelper {
return false; // fail, policy, neutral, temperror, permerror
}
Address[] getMailFrom(String[] headers) {
if (headers == null)
return null;
Address[] mailfrom = null;
for (String header : headers) {
String spf = getKeyValues(header).get("spf");
if (spf == null)
continue;
int i = spf.indexOf(SMTP_MAILFORM + "=");
if (i < 0)
continue;
String v = spf.substring(i + SMTP_MAILFORM.length() + 1);
int s = v.indexOf(' ');
if (s > 0)
v = v.substring(0, s);
if (v.startsWith("\"") && v.endsWith("\""))
v = v.substring(1, v.length() - 1);
try {
mailfrom = InternetAddress.parseHeader(v, false);
} catch (Throwable ex) {
Log.w(ex);
}
}
return mailfrom;
}
boolean getSPF() throws MessagingException {
ensureHeaders();
@ -2608,38 +2640,6 @@ public class MessageHelper {
return false;
}
Address[] getMailFrom(String[] headers) {
if (headers == null)
return null;
Address[] mailfrom = null;
for (String header : headers) {
String spf = getKeyValues(header).get("spf");
if (spf == null)
continue;
int i = spf.indexOf(SMTP_MAILFORM + "=");
if (i < 0)
continue;
String v = spf.substring(i + SMTP_MAILFORM.length() + 1);
int s = v.indexOf(' ');
if (s > 0)
v = v.substring(0, s);
if (v.startsWith("\"") && v.endsWith("\""))
v = v.substring(1, v.length() - 1);
try {
mailfrom = InternetAddress.parseHeader(v, false);
} catch (Throwable ex) {
Log.w(ex);
}
}
return mailfrom;
}
private String fixEncoding(String name, String header) {
if (header.trim().startsWith("=?"))
return header;