diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-24 12:24:46 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-24 12:24:46 +0100 |
| commit | a2fe9f151a0c435e07ef20fa3ae6f38d816da278 (patch) | |
| tree | b32ecc4c4911a05bf0213ba1b2b0fa971baaeb31 /src/main/java/eu/siacs | |
| parent | 5fcd69c68b5f530ac76836d4f3a761cdba958356 (diff) | |
Reviewed commit for FS#34 after merge
Diffstat (limited to 'src/main/java/eu/siacs')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java | 2 |
2 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 a926f9a9..47c9c9e2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -470,7 +470,7 @@ public class Message extends AbstractEntity { } public String getMergedBody() { - StringBuilder body = new StringBuilder(this.body.trim()); + StringBuilder body = new StringBuilder(this.body); Message current = this; while(current.mergeable(current.next())) { current = current.next(); diff --git a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java index 42f2d840..0e041454 100644 --- a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java +++ b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java @@ -159,7 +159,7 @@ public class ServiceDiscoveryResult { } public String getVer() { - return new String(Base64.encode(this.ver, Base64.DEFAULT)).trim(); + return new String(Base64.encode(this.ver, Base64.DEFAULT)); } public ServiceDiscoveryResult(Cursor cursor) throws JSONException { |