sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trim message bodys on display

This commit is contained in:
Daniel Gultsch 2015-02-07 12:29:17 +01:00
parent e1e09d5cba
commit 00b2e30938
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -376,9 +376,9 @@ public class Message extends AbstractEntity {
public String getMergedBody() { public String getMergedBody() {
final Message next = this.next(); final Message next = this.next();
if (this.mergeable(next)) { if (this.mergeable(next)) {
return getBody() + '\n' + next.getMergedBody(); return getBody().trim() + '\n' + next.getMergedBody();
} }
return getBody(); return getBody().trim();
} }
public boolean hasMeCommand() { public boolean hasMeCommand() {

2
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -154,7 +154,7 @@ public class UIHelper {
return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND, return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND,
UIHelper.getMessageDisplayName(message) + " "), false); UIHelper.getMessageDisplayName(message) + " "), false);
} else { } else {
return new Pair<>(message.getBody(), false); return new Pair<>(message.getBody().trim(), false);
} }
} }
} }