mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 08:29:24 +00:00
Code Issues Releases Wiki Activity

List-Unsubscribe: match links/email addresses

Browse source
This commit is contained in:
M66B 2022-01-09 17:21:05 +01:00
parent 3e7704dff3
commit bb88910d88
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -87,6 +87,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.activation.DataHandler;
@ -1928,8 +1929,16 @@ public class MessageHelper {
String scheme = uri.getScheme();
if ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme))
link = unsubscribe;
else
Log.w(new Throwable(unsubscribe));
else {
Pattern p =
Pattern.compile(PatternsCompat.AUTOLINK_WEB_URL.pattern() + "|" +
PatternsCompat.AUTOLINK_EMAIL_ADDRESS.pattern());
Matcher m = p.matcher(unsubscribe);
if (m.find())
link = unsubscribe.substring(m.start(), m.end());
else
Log.w(new Throwable(unsubscribe));
}
}
}