From 95cb2394154a287afcd295590d741096985ff69a Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 4 Jan 2017 19:41:20 +0100
Subject: Added columns to fileparams table: url, original file name, key and
 iv auto download of files moved from MessageParser to MessageAdapter download
 and open file representation cleaned up

---
 .../eu/siacs/conversations/utils/FileUtils.java    |  9 ++++++
 .../eu/siacs/conversations/utils/UIHelper.java     | 34 ++++++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/utils')

diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
index 18014894..3633025f 100644
--- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
@@ -13,6 +13,7 @@ import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 
 import java.io.File;
+import java.net.URL;
 import java.util.List;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
@@ -162,6 +163,14 @@ public final class FileUtils {
 		return "com.android.providers.media.documents".equals(uri.getAuthority());
 	}
 
+    public static String getRelevantExtension(URL url) {
+        if (url == null) {
+            return null;
+        }
+        String path = url.getPath();
+        return getRelevantExtension(path);
+    }
+
     public static String getRelevantExtension(String path) {
         if (path == null || path.isEmpty()) {
             return null;
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index a97b16a4..d9cdd34c 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -14,6 +14,7 @@ import java.util.Locale;
 
 import de.thedevstack.conversationsplus.ConversationsPlusColors;
 
+import de.thedevstack.conversationsplus.entities.FileParams;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
@@ -211,16 +212,26 @@ public class UIHelper {
 		} else if (mime.startsWith("image/")) {
 			return context.getString(R.string.image);
 		} else if (mime.contains("pdf")) {
-			return context.getString(R.string.pdf_document)	;
+			return context.getString(R.string.pdf_document);
 		} else if (mime.contains("application/vnd.android.package-archive")) {
-			return context.getString(R.string.apk)	;
+			return context.getString(R.string.apk);
 		} else if (mime.contains("vcard")) {
-			return context.getString(R.string.vcard)	;
+			return context.getString(R.string.vcard);
 		} else {
-			return message.getRelativeFilePath();
+            String filename = getDisplayFilename(message);
+            if (null == filename) {
+                return context.getString(R.string.file);
+            } else {
+                return filename;
+            }
 		}
 	}
 
+    public static String getDisplayFilename(final Message message) {
+        String originalFilename = (null != message.getFileParams()) ? message.getFileParams().getOriginalFilename() : null;
+        return (null != originalFilename) ? originalFilename : message.getRelativeFilePath();
+    }
+
 	public static String getMessageDisplayName(final Message message) {
 		final Conversation conversation = message.getConversation();
 		if (message.getStatus() == Message.STATUS_RECEIVED) {
@@ -281,7 +292,20 @@ public class UIHelper {
 		return LOCATION_QUESTIONS.contains(body);
 	}
 
-	public static String getHumanReadableFileSize(long filesize) {
+    public static String getHumanReadableFileSize(long size) {
+        String filesize;
+        if (size > (1.5 * 1024 * 1024)) {
+            filesize = size / (1024 * 1024)+ " MiB";
+        } else if (size > 0) {
+            filesize = size / 1024 + " KiB";
+        } else {
+            filesize = null;
+        }
+
+        return filesize;
+    }
+
+	public static String getHumanReadableDetailedFileSize(long filesize) {
         if (0 > filesize) {
             return "?";
         }
-- 
cgit v1.2.3