diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 20:53:25 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 20:53:25 +0200 |
| commit | 94a669fcb861d9cff4414d98abb289d1452c9300 (patch) | |
| tree | 9443c42eb6b8f9a874cac59fd01dd13bcc43d090 /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | 3a814addab32a46fea677765032e5d4ba8bb5161 (diff) | |
no trim of messages or password
check password with only spaces separately
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 8015eead..fc2fdafd 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -393,9 +393,9 @@ public class Message extends AbstractEntity { public String getMergedBody() { final Message next = this.next(); if (this.mergeable(next)) { - return getBody().trim() + '\n' + next.getMergedBody(); + return getBody() + '\n' + next.getMergedBody(); } - return getBody().trim(); + return getBody(); } public boolean hasMeCommand() { |