Merge branch 'develop' into SettingsGreyedOut

[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..32d9017 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -80,7 +80,8 @@ public class DisplayUtils {
         "msword",\r
         "vnd.openxmlformats-officedocument.wordprocessingml.document",\r
         "vnd.oasis.opendocument.text",\r
         "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
     };\r
     private static Set<String> SUBTYPES_DOCUMENT_SET = new HashSet<String>(Arrays.asList(SUBTYPES_DOCUMENT));\r
     private static final String[] SUBTYPES_SPREADSHEET = {\r


@@ -221,7 +222,7 @@ public class DisplayUtils {
 \r
     \r
     private static String getExtension(String filename) {\r
 \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
         return extension;\r
     }\r
     \r


@@ -233,8 +234,7 @@ public class DisplayUtils {
     public static String unixTimeToHumanReadable(long milliseconds) {\r
         Date date = new Date(milliseconds);\r
         DateFormat df = DateFormat.getDateTimeInstance();\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
     }\r
     \r
     \r