X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a98f14ecc3e97fc3a3eb6042dd5c0676f8504693..643162cac90518e21c60e8f39ee63426c63b092c:/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 da81f539..beb08c79 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -29,11 +29,11 @@ import java.util.Set;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
 
 /**
  * A helper class for some string operations.
@@ -73,6 +73,7 @@ public class DisplayUtils {
     private static final String TYPE_VIDEO = "video";
     
     private static final String SUBTYPE_PDF = "pdf";
+    private static final String SUBTYPE_XML = "xml";
     private static final String[] SUBTYPES_DOCUMENT = { "msword",
                                                         "vnd.openxmlformats-officedocument.wordprocessingml.document",
                                                         "vnd.oasis.opendocument.text",
@@ -164,9 +165,12 @@ public class DisplayUtils {
      */
     public static int getResourceId(String mimetype, String filename) {
 
-        if (mimetype == null || "DIR".equals(mimetype)) {
+        if (mimetype == null) {
+            return R.drawable.file;
+
+        } else if ("DIR".equals(mimetype)) {
             return R.drawable.ic_menu_archive;
-            
+
         } else {
             String [] parts = mimetype.split("/");
             String type = parts[0];
@@ -189,6 +193,9 @@ public class DisplayUtils {
                 if (SUBTYPE_PDF.equals(subtype)) {
                     return R.drawable.file_pdf;
                     
+                } else if (SUBTYPE_XML.equals(subtype)) {
+                    return R.drawable.file_doc;
+
                 } else if (SUBTYPES_DOCUMENT_SET.contains(subtype)) {
                     return R.drawable.file_doc;
 
@@ -200,7 +207,7 @@ public class DisplayUtils {
 
                 } else if (SUBTYPES_COMPRESSED_SET.contains(subtype)) {
                     return R.drawable.file_zip;
-                    
+
                 } else if (SUBTYPE_OCTET_STREAM.equals(subtype) ) {
                     if (getExtension(filename).equalsIgnoreCase(EXTENSION_RAR)) {
                         return R.drawable.file_zip;
@@ -318,6 +325,19 @@ public class DisplayUtils {
             }
         }
         
-        return dateString.toString().split(",")[0];
+        return dateString.toString().split(",")[0];
+    }
+
+    /**
+     * Update the passed path removing the last "/" if it is not the root folder
+     * @param path
+     */
+    public static String getPathWithoutLastSlash(String path) {
+
+        // Remove last slash from path
+        if (path.length() > 1 && path.charAt(path.length()-1) == OCFile.PATH_SEPARATOR.charAt(0)) {
+            path = path.substring(0, path.length()-1);
+        }
+        return path;
     }
 }