fix anonymous participant check condition for Join service messages
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/44d123bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/44d123bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/44d123bb Branch: refs/heads/swellrt Commit: 44d123bbc532fe311135d7583316ef28d8b1ef2b Parents: 2975abc Author: Antonio Tenorio Fornés <[email protected]> Authored: Tue Oct 4 16:44:55 2016 +0200 Committer: Antonio Tenorio Fornés <[email protected]> Committed: Tue Oct 4 16:49:17 2016 +0200 ---------------------------------------------------------------------- wave/build.gradle | 2 +- .../java/org/swellrt/server/box/servlet/JoinMessageService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/44d123bb/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 775ea42..fe3fa10 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -30,7 +30,7 @@ apply plugin: 'com.google.protobuf' /* Meta Data Info */ def title = 'SwellRT' def vendor = 'SwellRT Community' -version = "0.54.2-alpha" +version = "0.54.3-alpha" archivesBaseName = "swellrt" def distFolder = "swellrt" mainClassName = "org.waveprotocol.box.server.ServerMain" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/44d123bb/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java b/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java index 8514cee..2003244 100644 --- a/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java +++ b/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java @@ -130,7 +130,7 @@ public class JoinMessageService extends BaseService { String subject; - if (participantId != null){ + if (participantId != null && !acc.getId().isAnonymous()){ String inviter = participantId.getAddress().split("@")[0]; subject = MessageFormat.format(b.getString("joinNamedEmailSubject"), inviter, urlText); } else {
