Added method to get body from message if hasMeCommand and harmonized extraction of fileextension (FS#38)

1 files changed, 27 insertions, 20 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 8ab0fe8a..147d53e2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -323,27 +323,34 @@ public class JingleConnection implements Transferable {
 			Element fileSize = fileOffer.findChild("size");
 			Element fileNameElement = fileOffer.findChild("name");
 			if (fileNameElement != null) {
-				String[] filename = fileNameElement.getContent()
-						.toLowerCase(Locale.US).toLowerCase().split("\\.");
-				String extension = filename[filename.length - 1];
-				if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
-					message.setType(Message.TYPE_IMAGE);
-					message.setRelativeFilePath(message.getUuid()+"."+extension);
-				} else if (VALID_CRYPTO_EXTENSIONS.contains(
-						filename[filename.length - 1])) {
-					if (filename.length == 3) {
-						extension = filename[filename.length - 2];
-						if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
-							message.setType(Message.TYPE_IMAGE);
-							message.setRelativeFilePath(message.getUuid()+"."+extension);
-						} else {
-							message.setType(Message.TYPE_FILE);
-						}
-						if (filename[filename.length - 1].equals("otr")) {
-							message.setEncryption(Message.ENCRYPTION_OTR);
-						} else {
-							message.setEncryption(Message.ENCRYPTION_PGP);
+				String filename = fileNameElement.getContent()
+						.toLowerCase(Locale.US).toLowerCase();
+				final int lastDotPosition = filename.lastIndexOf('.');
+				final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1);
+				final String lastPart = lastDotPosition != -1 ?
+						filename.substring(lastDotPosition + 1) : "";
+				final String secondToLastPart = secondToLastDotPosition != -1 ?
+						filename.substring(secondToLastDotPosition + 1, lastDotPosition - 1) : "";
+				if (lastDotPosition != -1) {
+					if (VALID_IMAGE_EXTENSIONS.contains(lastPart)) {
+						message.setType(Message.TYPE_IMAGE);
+						message.setRelativeFilePath(message.getUuid()+"."+lastPart);
+					} else if (VALID_CRYPTO_EXTENSIONS.contains(lastPart)) {
+						if (secondToLastDotPosition != -1) {
+							if (VALID_IMAGE_EXTENSIONS.contains(secondToLastPart)) {
+								message.setType(Message.TYPE_IMAGE);
+								message.setRelativeFilePath(message.getUuid()+"."+secondToLastPart);
+							} else {
+								message.setType(Message.TYPE_FILE);
+							}
+							if (lastPart.equals("otr")) {
+								message.setEncryption(Message.ENCRYPTION_OTR);
+							} else {
+								message.setEncryption(Message.ENCRYPTION_PGP);
+							}
 						}
+					} else {
+						message.setType(Message.TYPE_FILE);
 					}
 				} else {
 					message.setType(Message.TYPE_FILE);