Merge branch 'trz/rebase' into trz/rename

1 files changed, 8 insertions, 7 deletions

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) {