Fixes FS#37 - Remove special treatment of unicode hearts

Fixes FS#34 - review all calls for String.trim()

7 files changed, 21 insertions, 29 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 4a4d3f03..f393264c 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -244,7 +244,7 @@ public class PgpEngine {
 		pgpSig.append("-----BEGIN PGP SIGNATURE-----");
 		pgpSig.append('\n');
 		pgpSig.append('\n');
-		pgpSig.append(signature.replace("\n", "").trim());
+		pgpSig.append(signature.replace("\n", ""));
 		pgpSig.append('\n');
 		pgpSig.append("-----END PGP SIGNATURE-----");
 		Intent params = new Intent();
@@ -297,7 +297,7 @@ public class PgpEngine {
 									sig = false;
 								} else {
 									if (!line.contains("Version")) {
-										signatureBuilder.append(line.trim());
+										signatureBuilder.append(line);
 									}
 								}
 							}
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index a215874f..81f6568b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -162,7 +162,7 @@ public class Contact implements ListItem, Blockable {
 		if (needle == null || needle.isEmpty()) {
 			return true;
 		}
-		needle = needle.toLowerCase(Locale.US).trim();
+		needle = needle.toLowerCase(Locale.US);
 		String[] parts = needle.split("\\s+");
 		if (parts.length > 1) {
 			for(int i = 0; i < parts.length; ++i) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index e3fb7944..d04dff87 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -59,7 +59,7 @@ public class Message extends AbstractEntity {
 	protected String conversationUuid;
 	protected Jid counterpart;
 	protected Jid trueCounterpart;
-	protected String body;
+	private String body;
 	protected String encryptedBody;
 	protected long timeSent;
 	protected int encryption;
@@ -319,16 +319,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))
@@ -385,13 +385,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.getBody().startsWith(ME_COMMAND)
 				);
 	}
 
@@ -509,7 +507,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;
 			}
@@ -522,7 +520,7 @@ public class Message extends AbstractEntity {
 		 * "http://example.com/image.jpg" text that will not be shown /abc.png"
 		 * or more than one image link in one message.
 		 */
-		if (body.trim().contains(" ")) {
+		if (getBody().contains(" ")) {
 			return Decision.NEVER;
 		}
 		try {
@@ -555,10 +553,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) {
@@ -568,10 +562,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 {
@@ -630,10 +624,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]);
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 186b4b98..16984910 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -71,7 +71,7 @@ public abstract class AbstractGenerator {
 			s.append(feature + "<");
 		}
 		byte[] sha1 = md.digest(s.toString().getBytes());
-		return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
+		return new String(Base64.encode(sha1, Base64.DEFAULT));
 	}
 
 	public static String getTimestamp(long time) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index dc472360..67eafefb 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -586,7 +586,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			resId = R.string.file_url;
 			url = message.getFileParams().url.toString();
 		} else {
-			url = message.getBody().trim();
+			url = message.getBody();
 			resId = R.string.file_url;
 		}
 		if (activity.copyTextToClipboard(url, resId)) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index b7ac3092..9699f7d4 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -529,8 +529,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		} else {
 			if (GeoHelper.isGeoUri(message.getBody())) {
 				displayLocationMessage(viewHolder,message);
-			} else if (message.bodyIsHeart()) {
-				displayHeartMessage(viewHolder, message.getBody().trim());
 			} else if (message.treatAsDownloadable() == Message.Decision.MUST) {
 				displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_x_filesize, UIHelper.getFileDescriptionString(activity, message)));
 			} else {
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index de669ea6..1e3d1caf 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -400,9 +400,9 @@ public class UIHelper {
 		if (counterpart==null) {
 			return "";
 		} else if (!counterpart.isBareJid()) {
-			return counterpart.getResourcepart().trim();
+			return counterpart.getResourcepart();
 		} else {
-			return counterpart.toString().trim();
+			return counterpart.toString();
 		}
 	}
 
@@ -412,7 +412,7 @@ public class UIHelper {
 				|| message.getType() != Message.TYPE_TEXT) {
 			return false;
 		}
-		String body = message.getBody() == null ? null : message.getBody().trim().toLowerCase(Locale.getDefault());
+		String body = message.getBody() == null ? null : message.getBody().toLowerCase(Locale.getDefault());
 		body = body.replace("?","").replace("¿","");
 		return LOCATION_QUESTIONS.contains(body);
 	}