diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
| commit | 05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch) | |
| tree | f702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/java/eu/siacs/conversations/entities | |
| parent | c41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff) | |
| parent | 20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Presences.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java index 49618f9e6..b3e8966a7 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presences.java +++ b/src/main/java/eu/siacs/conversations/entities/Presences.java @@ -55,7 +55,9 @@ public class Presences { synchronized (this.presences) { ArrayList<PresenceTemplate> templates = new ArrayList<>(presences.size()); for(Presence p : presences.values()) { - templates.add(new PresenceTemplate(p.getStatus(),p.getMessage())); + if (p.getMessage() != null && !p.getMessage().trim().isEmpty()) { + templates.add(new PresenceTemplate(p.getStatus(), p.getMessage())); + } } return templates; } |