cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Protect against NPE

Browse Source
This commit is contained in:
Max Dor
2019-01-11 22:08:35 +01:00
parent 2aa6e4d142
commit 83377ebee0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/kamax/mxisd/threepid/generator/email/GenericEmailNotificationGenerator.java
View File

@@ -26,6 +26,7 @@ import io.kamax.mxisd.config.ServerConfig;
import io.kamax.mxisd.config.threepid.medium.EmailConfig; import io.kamax.mxisd.config.threepid.medium.EmailConfig;
import io.kamax.mxisd.config.threepid.medium.EmailTemplateConfig; import io.kamax.mxisd.config.threepid.medium.EmailTemplateConfig;
import io.kamax.mxisd.threepid.generator.GenericTemplateNotificationGenerator; import io.kamax.mxisd.threepid.generator.GenericTemplateNotificationGenerator;
import org.apache.commons.lang3.StringUtils;
public class GenericEmailNotificationGenerator extends GenericTemplateNotificationGenerator implements EmailGenerator { public class GenericEmailNotificationGenerator extends GenericTemplateNotificationGenerator implements EmailGenerator {
@@ -46,8 +47,8 @@ public class GenericEmailNotificationGenerator extends GenericTemplateNotificati
@Override @Override
protected String populateForCommon(ThreePid recipient, String body) { protected String populateForCommon(ThreePid recipient, String body) {
body = super.populateForCommon(recipient, body); body = super.populateForCommon(recipient, body);
body = body.replace("%FROM_EMAIL%", cfg.getIdentity().getFrom()); body = body.replace("%FROM_EMAIL%", StringUtils.defaultIfEmpty(cfg.getIdentity().getFrom(), ""));
body = body.replace("%FROM_NAME%", cfg.getIdentity().getName()); body = body.replace("%FROM_NAME%", StringUtils.defaultIfEmpty(cfg.getIdentity().getName(), ""));
return body; return body;
} }