Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...

Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
Simple merge

diff --cc src/com/owncloud/android/utils/DisplayUtils.java
index 236a05f,8a281e9..46c6673
--- 1/src/com/owncloud/android/utils/DisplayUtils.java
--- 2/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@@ -50,94 -37,54 +37,61 @@@ import com.owncloud.android.MainApp
  import com.owncloud.android.R;\r
  import com.owncloud.android.datamodel.OCFile;\r
  \r
++import java.math.BigDecimal;\r
+ import java.net.IDN;\r
+ import java.text.DateFormat;\r
+ import java.util.Calendar;\r
+ import java.util.Date;\r
+ import java.util.HashMap;\r
+ import java.util.Map;\r
+ \r
  /**\r
   * A helper class for some string operations.\r
   */\r
  public class DisplayUtils {\r
      \r
      private static final String OWNCLOUD_APP_NAME = "ownCloud";\r
- \r
-     //private static String TAG = DisplayUtils.class.getSimpleName(); \r
      \r
      private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };\r
 +    private static final int[] sizeScales = { 0, 0, 0, 1, 1, 2, 2, 2, 2 };\r
  \r
-     private static HashMap<String, String> mimeType2HUmanReadable;\r
+     private static Map<String, String> mimeType2HumanReadable;\r
+ \r
      static {\r
-         mimeType2HUmanReadable = new HashMap<String, String>();\r
+         mimeType2HumanReadable = new HashMap<String, String>();\r
          // images\r
-         mimeType2HUmanReadable.put("image/jpeg", "JPEG image");\r
-         mimeType2HUmanReadable.put("image/jpg", "JPEG image");\r
-         mimeType2HUmanReadable.put("image/png", "PNG image");\r
-         mimeType2HUmanReadable.put("image/bmp", "Bitmap image");\r
-         mimeType2HUmanReadable.put("image/gif", "GIF image");\r
-         mimeType2HUmanReadable.put("image/svg+xml", "JPEG image");\r
-         mimeType2HUmanReadable.put("image/tiff", "TIFF image");\r
+         mimeType2HumanReadable.put("image/jpeg", "JPEG image");\r
+         mimeType2HumanReadable.put("image/jpg", "JPEG image");\r
+         mimeType2HumanReadable.put("image/png", "PNG image");\r
+         mimeType2HumanReadable.put("image/bmp", "Bitmap image");\r
+         mimeType2HumanReadable.put("image/gif", "GIF image");\r
+         mimeType2HumanReadable.put("image/svg+xml", "JPEG image");\r
+         mimeType2HumanReadable.put("image/tiff", "TIFF image");\r
          // music\r
-         mimeType2HUmanReadable.put("audio/mpeg", "MP3 music file");\r
-         mimeType2HUmanReadable.put("application/ogg", "OGG music file");\r
- \r
+         mimeType2HumanReadable.put("audio/mpeg", "MP3 music file");\r
+         mimeType2HumanReadable.put("application/ogg", "OGG music file");\r
      }\r
  \r
-     private static final String TYPE_APPLICATION = "application";\r
-     private static final String TYPE_AUDIO = "audio";\r
-     private static final String TYPE_IMAGE = "image";\r
-     private static final String TYPE_TXT = "text";\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 = { \r
-         "msword",\r
-         "vnd.openxmlformats-officedocument.wordprocessingml.document",\r
-         "vnd.oasis.opendocument.text",\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
-         "msexcel",\r
-         "vnd.ms-excel",\r
-         "vnd.openxmlformats-officedocument.spreadsheetml.sheet",\r
-         "vnd.oasis.opendocument.spreadsheet"\r
-     };\r
-     private static Set<String> SUBTYPES_SPREADSHEET_SET = new HashSet<String>(Arrays.asList(SUBTYPES_SPREADSHEET));\r
-     private static final String[] SUBTYPES_PRESENTATION = { \r
-         "mspowerpoint",\r
-         "vnd.ms-powerpoint",\r
-         "vnd.openxmlformats-officedocument.presentationml.presentation",\r
-         "vnd.oasis.opendocument.presentation"\r
-     };\r
-     private static Set<String> SUBTYPES_PRESENTATION_SET = new HashSet<String>(Arrays.asList(SUBTYPES_PRESENTATION));\r
-     private static final String[] SUBTYPES_COMPRESSED = {"x-tar", "x-gzip", "zip"};\r
-     private static final Set<String> SUBTYPES_COMPRESSED_SET = new HashSet<String>(Arrays.asList(SUBTYPES_COMPRESSED));\r
-     private static final String SUBTYPE_OCTET_STREAM = "octet-stream";\r
-     private static final String EXTENSION_RAR = "rar";\r
-     private static final String EXTENSION_RTF = "rtf";\r
-     private static final String EXTENSION_3GP = "3gp";\r
-     private static final String EXTENSION_PY = "py";\r
-     private static final String EXTENSION_JS = "js";\r
-     \r
      /**\r
       * Converts the file size in bytes to human readable output.\r
 -     * \r
 +     * <ul>\r
 +     *     <li>appends a size suffix, e.g. B, KB, MB etc.</li>\r
 +     *     <li>rounds the size based on the suffix to 0,1 or 2 decimals</li>\r
 +     * </ul>\r
 +     *\r
       * @param bytes Input file size\r
       * @return Like something readable like "12 MB"\r
       */\r
      public static String bytesToHumanReadable(long bytes) {\r
          double result = bytes;\r
--        int attachedsuff = 0;\r
--        while (result > 1024 && attachedsuff < sizeSuffixes.length) {\r
++        int attachedSuff = 0;\r
++        while (result > 1024 && attachedSuff < sizeSuffixes.length) {\r
              result /= 1024.;\r
--            attachedsuff++;\r
++            attachedSuff++;\r
          }\r
 -        result = ((int) (result * 100)) / 100.;\r
 -        return result + " " + sizeSuffixes[attachedsuff];\r
 +\r
 +        return new BigDecimal(result).setScale(\r
-                 sizeScales[attachedsuff], BigDecimal.ROUND_HALF_UP) + " " + sizeSuffixes[attachedsuff];\r
++                sizeScales[attachedSuff], BigDecimal.ROUND_HALF_UP) + " " + sizeSuffixes[attachedSuff];\r
      }\r
  \r
      /**\r