From 6da77bdf3b38fab3daa0de8776082038d8d62a78 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Mon, 13 Apr 2015 10:57:30 +0200
Subject: [PATCH] Bugfix for issue #1121

check with lowercase to also match JPEG, JPeg ...

changed image url in comment
---
 .../siacs/conversations/entities/Message.java | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 8015eeadb..21aa7779e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -430,23 +430,31 @@ public class Message extends AbstractEntity {
 	}
 
 	public boolean bodyContainsDownloadable() {
+		/**
+		 * 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 (body.contains(" ")) {
+			return false;
+		}
 		try {
-			URL url = new URL(this.getBody());
+			URL url = new URL(body);
 			if (!url.getProtocol().equalsIgnoreCase("http")
 					&& !url.getProtocol().equalsIgnoreCase("https")) {
 				return false;
 					}
-			if (url.getPath() == null) {
+
+			String sUrlPath = url.getPath();
+			if (sUrlPath == null || sUrlPath.isEmpty()) {
 				return false;
 			}
-			String[] pathParts = url.getPath().split("/");
-			String filename;
-			if (pathParts.length > 0) {
-				filename = pathParts[pathParts.length - 1].toLowerCase();
-			} else {
-				return false;
-			}
-			String[] extensionParts = filename.split("\\.");
+
+			int iSlashIndex = sUrlPath.lastIndexOf('/') + 1;
+
+			String sLastUrlPath = sUrlPath.substring(iSlashIndex).toLowerCase();
+
+			String[] extensionParts = sLastUrlPath.split("\\.");
 			if (extensionParts.length == 2
 					&& Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(
 						extensionParts[extensionParts.length - 1])) {