Prevent NPE

master
M66B 3 weeks ago
parent 7f1ec8f308
commit 50a6f2f80c

@ -870,9 +870,11 @@ public class MessageHelper {
String email = ((InternetAddress) from).getAddress(); String email = ((InternetAddress) from).getAddress();
String user = UriHelper.getEmailUser(email); String user = UriHelper.getEmailUser(email);
String domain = UriHelper.getEmailDomain(email); String domain = UriHelper.getEmailDomain(email);
Pair<String, String> extra = getExtra(email, message.extra); if (message.extra != null) {
if (extra.second != null) Pair<String, String> extra = getExtra(email, message.extra);
email = extra.second; if (extra.second != null)
email = extra.second;
}
address = address address = address
.replace("$from$", email) .replace("$from$", email)
.replace("$user$", user) .replace("$user$", user)

Loading…
Cancel
Save