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

Mail from first header

Browse Source
This commit is contained in:
M66B
2024-05-24 08:14:52 +02:00
parent 420d78efeb
commit bce1420a4e
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2204,32 +2204,30 @@ public class MessageHelper {
}
Address[] getMailFrom(String[] headers) {
if (headers == null)
if (headers == null || headers.length == 0)
return null;
Address[] mailfrom = null;
for (String header : headers) {
String spf = getKeyValues(header).get("spf");
if (spf == null)
continue;
String spf = getKeyValues(headers[0]).get("spf");
if (spf == null)
return null;
int i = spf.indexOf(SMTP_MAILFORM + "=");
if (i < 0)
continue;
int i = spf.indexOf(SMTP_MAILFORM + "=");
if (i < 0)
return null;
String v = spf.substring(i + SMTP_MAILFORM.length() + 1);
int s = v.indexOf(' ');
if (s > 0)
v = v.substring(0, s);
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);
if (v.startsWith("\"") && v.endsWith("\""))
v = v.substring(1, v.length() - 1);
try {
mailfrom = InternetAddress.parseHeader(v, false);
} catch (Throwable ex) {
Log.w(ex);
}
try {
mailfrom = InternetAddress.parseHeader(v, false);
} catch (Throwable ex) {
Log.w(ex);
}
return mailfrom;