Merge branch 'trz/rebase' into trz/rename

7 files changed, 93 insertions, 55 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
index 3a4c3d4b..50b1e4a7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
@@ -758,7 +758,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 					if (message.hasFileOnRemoteHost()) {
 						otherBody = message.getFileParams().url.toString();
 					} else {
-						otherBody = message.body;
+						otherBody = message.getBody();
 					}
 					if (otherBody != null && otherBody.equals(body)) {
 						return message;
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
index 9fbfce54..bb3140c3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
@@ -7,6 +7,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import de.thedevstack.conversationsplus.crypto.axolotl.XmppAxolotlSession;
+import de.thedevstack.conversationsplus.utils.FileUtils;
 import de.thedevstack.conversationsplus.utils.MimeUtils;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -417,6 +418,14 @@ public class Message extends AbstractEntity {
 		return getBody().startsWith(ME_COMMAND);
 	}
 
+	public String getBodyReplacedMeCommand(String replaceString) {
+		try {
+			return getBody().replaceAll("^" + Message.ME_COMMAND, replaceString + " ");
+		} catch (ArrayIndexOutOfBoundsException e) {
+			return getBody();
+		}
+	}
+
 	public boolean trusted() {
 		Contact contact = this.getContact();
 		return (status > STATUS_RECEIVED || (contact != null && contact.trusted()));
@@ -460,26 +469,30 @@ public class Message extends AbstractEntity {
 		NEVER,
 	}
 
-	private static String extractRelevantExtension(URL url) {
+	private String extractRelevantExtension(URL url) {
+		if (url == null) {
+			return null;
+		}
 		String path = url.getPath();
 		return extractRelevantExtension(path);
 	}
 
-	private static String extractRelevantExtension(String path) {
+	private String extractRelevantExtension(String path) {
 		if (path == null || path.isEmpty()) {
 			return null;
 		}
 		
 		String filename = path.substring(path.lastIndexOf('/') + 1).toLowerCase();
-		int dotPosition = filename.lastIndexOf(".");
 
-		if (dotPosition != -1) {
-			String extension = filename.substring(dotPosition + 1);
+		final String lastPart = FileUtils.getLastExtension(filename);
+
+		if (!lastPart.isEmpty()) {
 			// we want the real file extension, not the crypto one
-			if (Transferable.VALID_CRYPTO_EXTENSIONS.contains(extension)) {
-				return extractRelevantExtension(filename.substring(0,dotPosition));
+			final String secondToLastPart = FileUtils.getSecondToLastExtension(filename);
+			if (!secondToLastPart.isEmpty() && Transferable.VALID_CRYPTO_EXTENSIONS.contains(lastPart)) {
+				return secondToLastPart;
 			} else {
-				return extension;
+				return lastPart;
 			}
 		}
 		return null;
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index e7fbb5cd..bbd47089 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -36,6 +36,7 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.FileUtils;
 
 public class HttpDownloadConnection implements Transferable {
 
@@ -82,22 +83,22 @@ public class HttpDownloadConnection implements Transferable {
 			} else {
 				mUrl = new URL(message.getBody());
 			}
-			String[] parts = mUrl.getPath().toLowerCase().split("\\.");
-			String lastPart = parts.length >= 1 ? parts[parts.length - 1] : null;
-			String secondToLast = parts.length >= 2 ? parts[parts.length -2] : null;
-			if ("pgp".equals(lastPart) || "gpg".equals(lastPart)) {
+			final String sUrlFilename = mUrl.getPath().substring(mUrl.getPath().lastIndexOf('/')).toLowerCase();
+			final String lastPart = FileUtils.getLastExtension(sUrlFilename);
+
+			if (!lastPart.isEmpty() && ("pgp".equals(lastPart) || "gpg".equals(lastPart))) {
 				this.message.setEncryption(Message.ENCRYPTION_PGP);
 			} else if (message.getEncryption() != Message.ENCRYPTION_OTR
 					&& message.getEncryption() != Message.ENCRYPTION_AXOLOTL) {
 				this.message.setEncryption(Message.ENCRYPTION_NONE);
 			}
 			String extension;
-			if (VALID_CRYPTO_EXTENSIONS.contains(lastPart)) {
-				extension = secondToLast;
+			if (!lastPart.isEmpty() && VALID_CRYPTO_EXTENSIONS.contains(lastPart)) {
+				extension = FileUtils.getSecondToLastExtension(sUrlFilename);
 			} else {
 				extension = lastPart;
 			}
-			message.setRelativeFilePath(message.getUuid()+"."+extension);
+			message.setRelativeFilePath(message.getUuid() + "." + extension);
 			this.file = FileBackend.getFile(message, false);
 			String reference = mUrl.getRef();
 			if (reference != null && reference.length() == 96) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index 1d8af20c..09db28d0 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -281,9 +281,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (message.getBody() != null) {
 			final String nick = UIHelper.getMessageDisplayName(message);
 			String body;
-			try {
-				body = message.getBody().replaceAll("^" + Message.ME_COMMAND, nick + " ");
-			} catch (ArrayIndexOutOfBoundsException e) {
+			if (message.hasMeCommand()) {
+				body = message.getBodyReplacedMeCommand(nick);
+			} else {
 				body = message.getBody();
 			}
 			final SpannableString formattedBody = new SpannableString(body);
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java b/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
index a8375dc0..9b627f6b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
@@ -147,4 +147,33 @@ public class FileUtils {
 	public static boolean isMediaDocument(Uri uri) {
 		return "com.android.providers.media.documents".equals(uri.getAuthority());
 	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return last extension or empty string
+	 */
+	public static String getLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final String lastPart = lastDotPosition != -1 ?
+				filename.substring(lastDotPosition + 1) : "";
+		return lastPart;
+	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return second to last extension or empty string
+	 */
+	public static String getSecondToLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1);
+		final String secondToLastPart = secondToLastDotPosition != -1 ?
+				filename.substring(secondToLastDotPosition + 1, lastDotPosition) : "";
+		return secondToLastPart;
+	}
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
index 44dc4774..e6a5ef7f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
@@ -178,9 +178,8 @@ public class UIHelper {
 				return new Pair<>(getFileDescriptionString(context,message),true);
 			}
 		} else {
-			if (message.getBody().startsWith(Message.ME_COMMAND)) {
-				return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND,
-						UIHelper.getMessageDisplayName(message) + " "), false);
+			if (message.hasMeCommand()) {
+				return new Pair<>(message.getBodyReplacedMeCommand(UIHelper.getMessageDisplayName(message)), false);
 			} else if (GeoHelper.isGeoUri(message.getBody())) {
 				if (message.getStatus() == Message.STATUS_RECEIVED) {
 					return new Pair<>(context.getString(R.string.received_location), true);
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);