Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

[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 abbf44e..43e5708 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -37,6 +37,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;\r
 import com.owncloud.android.datamodel.OCFile;\r
 \r
 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.net.IDN;\r
 import java.text.DateFormat;\r
 import java.util.Calendar;\r


@@ -52,6 +53,7 @@ public class DisplayUtils {
     private static final String OWNCLOUD_APP_NAME = "ownCloud";\r
     \r
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };\r
     private static final String OWNCLOUD_APP_NAME = "ownCloud";\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 Map<String, String> mimeType2HumanReadable;\r
 \r
 \r
     private static Map<String, String> mimeType2HumanReadable;\r
 \r


@@ -72,19 +74,24 @@ public class DisplayUtils {
 \r
     /**\r
      * Converts the file size in bytes to human readable output.\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
      * @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
             result /= 1024.;\r

-            attachedsuff++;\r
+            attachedSuff++;\r

         }\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

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


@@ -193,31 +200,19 @@ public class DisplayUtils {
         else if ((System.currentTimeMillis() - time) < 60 * 1000) {\r
             return c.getString(R.string.file_list_seconds_ago);\r
         } else {\r
         else if ((System.currentTimeMillis() - time) < 60 * 1000) {\r
             return c.getString(R.string.file_list_seconds_ago);\r
         } else {\r

-            // Workaround 2.x bug (see https://github.com/owncloud/android/issues/716)\r
-            if (    Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB && \r
-                    (System.currentTimeMillis() - time) > 24 * 60 * 60 * 1000   ) {\r
-                Date date = new Date(time);\r
-                date.setHours(0);\r
-                date.setMinutes(0);\r
-                date.setSeconds(0);\r
-                dateString = DateUtils.getRelativeDateTimeString(\r
-                        c, date.getTime(), minResolution, transitionResolution, flags\r
-                );\r
-            } else {\r
-                dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);\r
-            }\r
+            dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);\r

         }\r
 \r
         String[] parts = dateString.toString().split(",");\r
         if (parts.length == 2) {\r
         }\r
 \r
         String[] parts = dateString.toString().split(",");\r
         if (parts.length == 2) {\r

-            if(parts[0].contains(":") && !parts[1].contains(":")) {\r
-                return parts[1];\r
-            } else if(parts[1].contains(":") && !parts[0].contains(":")) {\r
+            if (parts[1].contains(":") && !parts[0].contains(":")) {\r

                 return parts[0];\r
                 return parts[0];\r

+            } else if (parts[0].contains(":") && !parts[1].contains(":")) {\r
+                return parts[1];\r

             }\r
         }\r
             }\r
         }\r

-        //dateString contains unexpected format. use localized, absolute date.\r
-        return DisplayUtils.unixTimeToHumanReadable(time);\r
+        //dateString contains unexpected format. fallback: use relative date time string from android api as is.\r
+        return dateString.toString();\r

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