diff options
Diffstat (limited to '')
| -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 { |