Merge branch 'master' into develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / DisplayUtils.java

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index f95c890..999700f 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -26,6 +26,7 @@ import java.util.Date;
 import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.Set;\r
+import java.util.Vector;\r
 \r
 import android.annotation.TargetApi;\r
 import android.content.Context;\r
@@ -80,7 +81,8 @@ public class DisplayUtils {
         "msword",\r
         "vnd.openxmlformats-officedocument.wordprocessingml.document",\r
         "vnd.oasis.opendocument.text",\r
-        "rtf"\r
+        "rtf",\r
+        "javascript"\r
     };\r
     private static Set<String> SUBTYPES_DOCUMENT_SET = new HashSet<String>(Arrays.asList(SUBTYPES_DOCUMENT));\r
     private static final String[] SUBTYPES_SPREADSHEET = {\r
@@ -221,20 +223,19 @@ public class DisplayUtils {
 \r
     \r
     private static String getExtension(String filename) {\r
-        String extension = filename.substring(filename.lastIndexOf(".") + 1);\r
+        String extension = filename.substring(filename.lastIndexOf(".") + 1).toLowerCase();\r
         return extension;\r
     }\r
     \r
     /**\r
      * Converts Unix time to human readable format\r
-     * @param miliseconds that have passed since 01/01/1970\r
+     * @param milliseconds that have passed since 01/01/1970\r
      * @return The human readable time for the users locale\r
      */\r
     public static String unixTimeToHumanReadable(long milliseconds) {\r
         Date date = new Date(milliseconds);\r
         DateFormat df = DateFormat.getDateTimeInstance();\r
-        //return date.toLocaleString();\r
-        return df.format(date); \r
+        return df.format(date);\r
     }\r
     \r
     \r
@@ -340,4 +341,5 @@ public class DisplayUtils {
         }\r
         return path;\r
     }\r
+\r
 }\r