some mime and pgp fixes for file transfer

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
index 6aff643a..25f33907 100644
--- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
+++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
@@ -55,13 +55,15 @@ public class DownloadableFile extends File {
 	}
 
 	public String getMimeType() {
-		if (mime==null) {
-			mime = URLConnection.guessContentTypeFromName(this.getAbsolutePath());
-			if (mime == null) {
-				mime = "";
-			}
+		String path = this.getAbsolutePath();
+		String mime = URLConnection.guessContentTypeFromName(path);
+		if (mime != null) {
+			return mime;
+		} else if (mime == null && path.endsWith(".webp")) {
+			return "image/webp";
+		} else {
+			return "";
 		}
-		return mime;
 	}
 
 	public void setExpectedSize(long size) {