Consider application/xml for XML files

[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 a1afb89..beb08c7 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -73,6 +73,7 @@ public class DisplayUtils {
     private static final String TYPE_VIDEO = "video";\r
     \r
     private static final String SUBTYPE_PDF = "pdf";\r
     private static final String TYPE_VIDEO = "video";\r
     \r
     private static final String SUBTYPE_PDF = "pdf";\r

+    private static final String SUBTYPE_XML = "xml";\r

     private static final String[] SUBTYPES_DOCUMENT = { "msword",\r
                                                         "vnd.openxmlformats-officedocument.wordprocessingml.document",\r
                                                         "vnd.oasis.opendocument.text",\r
     private static final String[] SUBTYPES_DOCUMENT = { "msword",\r
                                                         "vnd.openxmlformats-officedocument.wordprocessingml.document",\r
                                                         "vnd.oasis.opendocument.text",\r


@@ -164,9 +165,12 @@ public class DisplayUtils {
      */\r
     public static int getResourceId(String mimetype, String filename) {\r
 \r
      */\r
     public static int getResourceId(String mimetype, String filename) {\r
 \r

-        if (mimetype == null || "DIR".equals(mimetype)) {\r
+        if (mimetype == null) {\r
+            return R.drawable.file;\r
+\r
+        } else if ("DIR".equals(mimetype)) {\r

             return R.drawable.ic_menu_archive;\r
             return R.drawable.ic_menu_archive;\r

-            \r
+\r

         } else {\r
             String [] parts = mimetype.split("/");\r
             String type = parts[0];\r
         } else {\r
             String [] parts = mimetype.split("/");\r
             String type = parts[0];\r


@@ -189,6 +193,9 @@ public class DisplayUtils {
                 if (SUBTYPE_PDF.equals(subtype)) {\r
                     return R.drawable.file_pdf;\r
                     \r
                 if (SUBTYPE_PDF.equals(subtype)) {\r
                     return R.drawable.file_pdf;\r
                     \r

+                } else if (SUBTYPE_XML.equals(subtype)) {\r
+                    return R.drawable.file_doc;\r
+\r

                 } else if (SUBTYPES_DOCUMENT_SET.contains(subtype)) {\r
                     return R.drawable.file_doc;\r
 \r
                 } else if (SUBTYPES_DOCUMENT_SET.contains(subtype)) {\r
                     return R.drawable.file_doc;\r
 \r


@@ -200,7 +207,7 @@ public class DisplayUtils {
 \r
                 } else if (SUBTYPES_COMPRESSED_SET.contains(subtype)) {\r
                     return R.drawable.file_zip;\r
 \r
                 } else if (SUBTYPES_COMPRESSED_SET.contains(subtype)) {\r
                     return R.drawable.file_zip;\r

-                    \r
+\r

                 } else if (SUBTYPE_OCTET_STREAM.equals(subtype) ) {\r
                     if (getExtension(filename).equalsIgnoreCase(EXTENSION_RAR)) {\r
                         return R.drawable.file_zip;\r
                 } else if (SUBTYPE_OCTET_STREAM.equals(subtype) ) {\r
                     if (getExtension(filename).equalsIgnoreCase(EXTENSION_RAR)) {\r
                         return R.drawable.file_zip;\r


@@ -318,7 +325,7 @@ public class DisplayUtils {
             }\r
         }\r
         \r
             }\r
         }\r
         \r

-        return dateString.toString().split(",")[0];
+        return dateString.toString().split(",")[0];\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r