2 files changed, 49 insertions, 57 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
index bce8e571..7d5741d9 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
@@ -8,6 +8,7 @@ import de.thedevstack.conversationsplus.utils.MimeUtils;
  */
 public class FileParams {
     private String name;
+    private String originalFilename;
     private String path;
     private String url;
     private String mimeType;
@@ -15,6 +16,8 @@ public class FileParams {
     private int width = 0;
     private int height = 0;
     private FileStatus fileStatus;
+    private byte[] aeskey;
+    private byte[] iv;
 
     public FileParams() {
         fileStatus = FileStatus.UNDEFINED;
@@ -88,6 +91,39 @@ public class FileParams {
         return path;
     }
 
+    public void setKeyAndIv(byte[] keyIvCombo) {
+        if (null != keyIvCombo) {
+            if (keyIvCombo.length == 48) {
+                this.aeskey = new byte[32];
+                this.iv = new byte[16];
+                System.arraycopy(keyIvCombo, 0, this.iv, 0, 16);
+                System.arraycopy(keyIvCombo, 16, this.aeskey, 0, 32);
+            } else if (keyIvCombo.length >= 32) {
+                this.aeskey = new byte[32];
+                System.arraycopy(keyIvCombo, 0, aeskey, 0, 32);
+            } else if (keyIvCombo.length >= 16) {
+                this.aeskey = new byte[16];
+                System.arraycopy(keyIvCombo, 0, this.aeskey, 0, 16);
+            }
+        }
+    }
+
+    public void setKey(byte[] key) {
+        this.aeskey = key;
+    }
+
+    public void setIv(byte[] iv) {
+        this.iv = iv;
+    }
+
+    public byte[] getKey() {
+        return this.aeskey;
+    }
+
+    public byte[] getIv() {
+        return this.iv;
+    }
+
     /**
      * Sets the path to the file.
      * If no file name is stored yet here - this method tries to extract the file name from the path.
@@ -126,4 +162,12 @@ public class FileParams {
     public FileStatus getFileStatus() {
         return this.fileStatus;
     }
+
+    public void setOriginalFilename(String originalFilename) {
+        this.originalFilename = originalFilename;
+    }
+
+    public String getOriginalFilename() {
+        return this.originalFilename;
+    }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
index a81ba404..a553a3e6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
@@ -9,6 +9,7 @@ import java.net.URL;
 import de.thedevstack.conversationsplus.crypto.axolotl.XmppAxolotlSession;
 import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.utils.FileUtils;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.MimeUtils;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -337,7 +338,7 @@ public class Message extends AbstractEntity {
 
 	public void setType(int type) {
 		this.type = type;
-        if (null != this.fileParams && (type == Message.TYPE_FILE || type == Message.TYPE_IMAGE)) {
+        if (null == this.fileParams && (type == Message.TYPE_FILE || type == Message.TYPE_IMAGE)) {
             this.setFileParams(new FileParams());
         }
 	}
@@ -480,18 +481,6 @@ public class Message extends AbstractEntity {
 		NOT_DECIDED,
 	}
 
-	private String extractRelevantExtension(URL url) {
-		if (url == null) {
-			return null;
-		}
-		String path = url.getPath();
-		return extractRelevantExtension(path);
-	}
-
-	private String extractRelevantExtension(String path) {
-        return FileUtils.getRelevantExtension(path);
-	}
-
 	public String getMimeType() { // TODO: Move to fileparams
 		if (relativeFilePath != null) {
 			int start = relativeFilePath.lastIndexOf('.') + 1;
@@ -502,7 +491,7 @@ public class Message extends AbstractEntity {
 			}
 		} else {
 			try {
-				return MimeUtils.guessMimeTypeFromExtension(extractRelevantExtension(new URL(this.getBody())));
+				return MimeUtils.guessMimeTypeFromExtension(FileUtils.getRelevantExtension(new URL(this.getBody())));
 			} catch (MalformedURLException e) {
 				return null;
 			}
@@ -525,50 +514,9 @@ public class Message extends AbstractEntity {
 		if (mTreatAsDownloadAble != Decision.NOT_DECIDED) {
 			return mTreatAsDownloadAble;
 		}
-		/**
-		 * 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 (getBody().contains(" ")) {
-			mTreatAsDownloadAble = Decision.NEVER;
-			return mTreatAsDownloadAble;
-		}
-		try {
-			URL url = new URL(body);
-			if (!url.getProtocol().equalsIgnoreCase("http") && !url.getProtocol().equalsIgnoreCase("https")) {
-				mTreatAsDownloadAble = Decision.NEVER;
-				return mTreatAsDownloadAble;
-			}
-			String extension = extractRelevantExtension(url);
-			if (extension == null) {
-				mTreatAsDownloadAble = Decision.NEVER;
-				return mTreatAsDownloadAble;
-			}
-			String ref = url.getRef();
-			boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}");
-
-			if (encrypted) {
-				if (MimeUtils.guessMimeTypeFromExtension(extension) != null) {
-					mTreatAsDownloadAble = Decision.MUST;
-					return mTreatAsDownloadAble;
-				} else {
-					mTreatAsDownloadAble = Decision.NEVER;
-					return mTreatAsDownloadAble;
-				}
-			} else if (Transferable.VALID_IMAGE_EXTENSIONS.contains(extension)
-					|| Transferable.WELL_KNOWN_EXTENSIONS.contains(extension)) {
-				mTreatAsDownloadAble = Decision.SHOULD;
-				return mTreatAsDownloadAble;
-			} else {
-				mTreatAsDownloadAble = Decision.NEVER;
-				return mTreatAsDownloadAble;
-			}
 
-		} catch (MalformedURLException e) {
-			mTreatAsDownloadAble = Decision.NEVER;
-			return mTreatAsDownloadAble;
-		}
+        MessageUtil.extractFileParamsFromBody(this);
+        return this.mTreatAsDownloadAble;
 	}
 
 	public void untie() {