Merge branch 'trz/rebase' into trz/rename

1 files changed, 29 insertions, 33 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
index b57653d4..eff9a947 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
@@ -32,6 +32,7 @@ import de.thedevstack.conversationsplus.entities.TransferablePlaceholder;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.utils.FileUtils;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -323,44 +324,39 @@ 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 String lastPart = FileUtils.getLastExtension(filename);
+				final String secondToLastPart = FileUtils.getSecondToLastExtension(filename);
+				if (!lastPart.isEmpty()) {
+					if (VALID_IMAGE_EXTENSIONS.contains(lastPart)) {
+						message.setType(Message.TYPE_IMAGE);
+						message.setRelativeFilePath(message.getUuid()+"."+lastPart);
+					} else if (VALID_CRYPTO_EXTENSIONS.contains(lastPart)) {
+						if (!secondToLastPart.isEmpty()) {
+							if (VALID_IMAGE_EXTENSIONS.contains(secondToLastPart)) {
+								message.setType(Message.TYPE_IMAGE);
+								message.setRelativeFilePath(message.getUuid()+"."+secondToLastPart);
+							} else {
+								message.setType(Message.TYPE_FILE);
+								message.setRelativeFilePath(message.getUuid() + "_"
+										+ filename.substring(0, filename.length() - (secondToLastPart.length() + 1)));
+							}
+							if (lastPart.equals("otr")) {
+								message.setEncryption(Message.ENCRYPTION_OTR);
+							} else {
+								message.setEncryption(Message.ENCRYPTION_PGP);
+							}
 						}
+					} else {
+						message.setType(Message.TYPE_FILE);
+						message.setRelativeFilePath(message.getUuid() + "_" + filename);
 					}
 				} else {
 					message.setType(Message.TYPE_FILE);
+					message.setRelativeFilePath(message.getUuid() + "_" + filename);
 				}
-				if (message.getType() == Message.TYPE_FILE) {
-					String suffix = "";
-					if (!fileNameElement.getContent().isEmpty()) {
-						String parts[] = fileNameElement.getContent().split("/");
-						suffix = parts[parts.length - 1];
-						if (message.getEncryption() == Message.ENCRYPTION_OTR  && suffix.endsWith(".otr")) {
-							suffix = suffix.substring(0,suffix.length() - 4);
-						} else if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) {
-							suffix = suffix.substring(0,suffix.length() - 4);
-						}
-					}
-					message.setRelativeFilePath(message.getUuid()+"_"+suffix);
-				}
+
 				long size = Long.parseLong(fileSize.getContent());
 				message.setBody(Long.toString(size));
 				conversation.add(message);