sizeScale 1 for MB, code removed for unsupported legacy Android versions

src/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -553,8 +553,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
 
         mQuotaTextView.setText(String.format(
                 getString(R.string.drawer_quota),
-                DisplayUtils.quotaBytesToHumanReadable(usedSpace),
-                DisplayUtils.quotaBytesToHumanReadable(totalSpace)));
+                DisplayUtils.bytesToHumanReadable(usedSpace),
+                DisplayUtils.bytesToHumanReadable(totalSpace)));
 
         showQuota(true);
     }

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

@@ -1,23 +1,25 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
+ *   @author Andy Scherzinger
  *   @author Bartek Przybylski
  *   @author David A. Velasco
  *   Copyright (C) 2011  Bartek Przybylski
  *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 Andy Scherzinger
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.utils;
@@ -37,7 +39,6 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.ContextCompat;
 import android.text.format.DateUtils;
-import android.view.Display;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
@@ -60,16 +61,16 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * A helper class for some string operations.
+ * A helper class for UI/display related operations.
  */
 public class DisplayUtils {
     private static final String TAG = DisplayUtils.class.getSimpleName();
 
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
     private static final int[] sizeScales = { 0, 0, 1, 1, 1, 2, 2, 2, 2 };
-    private static final int[] quotaSizeScales = { 0, 0, 0, 1, 1, 2, 2, 2, 2 };
     public static final int RELATIVE_THRESHOLD_WARNING = 90;
     public static final int RELATIVE_THRESHOLD_CRITICAL = 95;
+    public static final String MIME_TYPE_UNKNOWN = "Unknown type";
 
     private static Map<String, String> mimeType2HumanReadable;
 
@@ -88,34 +89,6 @@ public class DisplayUtils {
         mimeType2HumanReadable.put("application/ogg", "OGG music file");
     }
 
-    /**
-     * Converts the file size in bytes to human readable output.
-     * <ul>
-     *     <li>appends a size suffix, e.g. B, KB, MB etc.</li>
-     *     <li>rounds the size based on the suffix to 0,1 or 2 decimals</li>
-     * </ul>
-     *
-     * @param bytes Input file size
-     * @return something readable like "12 MB"
-     */
-    public static String bytesToHumanReadable(long bytes) {
-        return bytesToHumanReadable(bytes, sizeScales, sizeSuffixes);
-    }
-
-    /**
-     * Converts the file size in bytes to human readable output.
-     * <ul>
-     *     <li>appends a size suffix, e.g. B, KB, MB etc.</li>
-     *     <li>rounds the size based on the suffix to 0,1 or 2 decimals</li>
-     * </ul>
-     *
-     * @param bytes Input file size
-     * @return something readable like "12 MB"
-     */
-    public static String quotaBytesToHumanReadable(long bytes) {
-        return bytesToHumanReadable(bytes, quotaSizeScales, sizeSuffixes);
-    }
-
     /**
      * Converts the file size in bytes to human readable output.
      * <ul>
@@ -124,11 +97,9 @@ public class DisplayUtils {
      * </ul>
      *
      * @param bytes        Input file size
-     * @param sizeScales   scales for the different size units
-     * @param sizeSuffixes suffixes for the different size units
      * @return something readable like "12 MB"
      */
-    private static String bytesToHumanReadable(long bytes, int[] sizeScales, String[] sizeSuffixes) {
+    public static String bytesToHumanReadable(long bytes) {
         double result = bytes;
         int suffixIndex = 0;
         while (result > 1024 && suffixIndex < sizeSuffixes.length) {
@@ -145,7 +116,7 @@ public class DisplayUtils {
      * like "JPG image".
      * 
      * @param mimetype MIME type to convert
-     * @return A human friendly version of the MIME type
+     * @return A human friendly version of the MIME type, {@link #MIME_TYPE_UNKNOWN} if it can't be converted
      */
     public static String convertMIMEtoPrettyPrint(String mimetype) {
         if (mimeType2HumanReadable.containsKey(mimetype)) {
@@ -153,11 +124,12 @@ public class DisplayUtils {
         }
         if (mimetype.split("/").length >= 2)
             return mimetype.split("/")[1].toUpperCase() + " file";
-        return "Unknown type";
+        return MIME_TYPE_UNKNOWN;
     }
 
     /**
      * Converts Unix time to human readable format
+     *
      * @param milliseconds that have passed since 01/01/1970
      * @return The human readable time for the users locale
      */
@@ -169,6 +141,7 @@ public class DisplayUtils {
     
     /**
      * Converts an internationalized domain name (IDN) in an URL to and from ASCII/Unicode.
+     *
      * @param url the URL where the domain name should be converted
      * @param toASCII if true converts from Unicode to ASCII, if false converts from ASCII to Unicode
      * @return the URL containing the converted domain name
@@ -299,7 +272,7 @@ public class DisplayUtils {
     }
 
     /**
-     * Gets the screen size in pixels in a backwards compatible way.
+     * Gets the screen size in pixels.
      *
      * @param caller Activity calling; needed to get access to the {@link android.view.WindowManager}
      * @return Size in pixels of the screen, or default {@link Point} if caller is null
@@ -307,12 +280,7 @@ public class DisplayUtils {
     public static Point getScreenSize(Activity caller) {
         Point size = new Point();
         if (caller != null) {
-            Display display = caller.getWindowManager().getDefaultDisplay();
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
-                display.getSize(size);
-            } else {
-                size.set(display.getWidth(), display.getHeight());
-            }
+            caller.getWindowManager().getDefaultDisplay().getSize(size);
         }
         return size;
     }
@@ -359,9 +327,9 @@ public class DisplayUtils {
     }
 
     /**
-     * set the owncloud standard colors for the snackbar.
+     * set the Nextcloud standard colors for the snackbar.
      *
-     * @param context the context relevant for setting the color according to the context's theme
+     * @param context  the context relevant for setting the color according to the context's theme
      * @param snackbar the snackbar to be colored
      */
     public static void colorSnackbar(Context context, Snackbar snackbar) {