1 files changed, 17 insertions, 19 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index f37ae427..f800def1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -11,7 +11,6 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
 import eu.siacs.conversations.utils.GeoHelper;
 import eu.siacs.conversations.utils.MimeUtils;
-import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
@@ -355,16 +354,16 @@ public class Message extends AbstractEntity {
 	public boolean equals(Message message) {
 		if (this.serverMsgId != null && message.getServerMsgId() != null) {
 			return this.serverMsgId.equals(message.getServerMsgId());
-		} else if (this.body == null || this.counterpart == null) {
+		} else if (this.getBody() == null || this.counterpart == null) {
 			return false;
 		} else {
 			String body, otherBody;
 			if (this.hasFileOnRemoteHost()) {
 				body = getFileParams().url.toString();
-				otherBody = message.body == null ? null : message.body.trim();
+				otherBody = message.getBody() == null ? null : message.getBody();
 			} else {
-				body = this.body;
-				otherBody = message.body;
+				body = this.getBody();
+				otherBody = message.getBody();
 			}
 			if (message.getRemoteMsgId() != null) {
 				return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid))
@@ -423,13 +422,11 @@ public class Message extends AbstractEntity {
 						this.getCounterpart().equals(message.getCounterpart()) &&
 						(message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
 						!GeoHelper.isGeoUri(message.getBody()) &&
-						!GeoHelper.isGeoUri(this.body) &&
+						!GeoHelper.isGeoUri(this.getBody()) &&
 						message.treatAsDownloadable() == Decision.NEVER &&
 						this.treatAsDownloadable() == Decision.NEVER &&
 						!message.getBody().startsWith(ME_COMMAND) &&
 						!this.getBody().startsWith(ME_COMMAND) &&
-						!this.bodyIsHeart() &&
-						!message.bodyIsHeart() &&
 						this.isTrusted() == message.isTrusted()
 				);
 	}
@@ -451,7 +448,7 @@ public class Message extends AbstractEntity {
 		while(current.mergeable(current.next())) {
 			current = current.next();
 			body.append(MERGE_SEPARATOR);
-			body.append(current.getBody().trim());
+			body.append(current.getBody());
 		}
 		return body.toString();
 	}
@@ -551,7 +548,7 @@ public class Message extends AbstractEntity {
 			}
 		} else {
 			try {
-				return MimeUtils.guessMimeTypeFromExtension(extractRelevantExtension(new URL(body.trim())));
+				return MimeUtils.guessMimeTypeFromExtension(extractRelevantExtension(new URL(this.getBody())));
 			} catch (MalformedURLException e) {
 				return null;
 			}
@@ -559,7 +556,12 @@ public class Message extends AbstractEntity {
 	}
 
 	public Decision treatAsDownloadable() {
-		if (body.trim().contains(" ")) {
+		/**
+		 * there are a few cases where spaces result in an unwanted behavior, e.g.
+		 * "http://example.com/image.jpg" text that will not be shown /abc.png"
+		 * or more than one image link in one message.
+		 */
+		if (getBody().contains(" ")) {
 			return Decision.NEVER;
 		}
 		try {
@@ -592,10 +594,6 @@ public class Message extends AbstractEntity {
 		}
 	}
 
-	public boolean bodyIsHeart() {
-		return body != null && UIHelper.HEARTS.contains(body.trim());
-	}
-
 	public FileParams getFileParams() {
 		FileParams params = getLegacyFileParams();
 		if (params != null) {
@@ -605,10 +603,10 @@ public class Message extends AbstractEntity {
 		if (this.transferable != null) {
 			params.size = this.transferable.getFileSize();
 		}
-		if (body == null) {
+		if (this.getBody() == null) {
 			return params;
 		}
-		String parts[] = body.split("\\|");
+		String parts[] = this.getBody().split("\\|");
 		switch (parts.length) {
 			case 1:
 				try {
@@ -667,10 +665,10 @@ public class Message extends AbstractEntity {
 
 	public FileParams getLegacyFileParams() {
 		FileParams params = new FileParams();
-		if (body == null) {
+		if (this.getBody() == null) {
 			return params;
 		}
-		String parts[] = body.split(",");
+		String parts[] = this.getBody().split(",");
 		if (parts.length == 3) {
 			try {
 				params.size = Long.parseLong(parts[0]);