Merge pull request #298 from doncung/UpdateLocalizedFilesize

Update localized filesize
box · Jul 19, 2017 · 6f87f13 · 6f87f13
2 parents dc2dedc + 2037353
commit 6f87f13
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/box-content-sdk/build.gradle b/box-content-sdk/build.gradle
@@ -7,9 +7,9 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 40008
-        versionName "4.0.8" /* Update in BoxConfig.SDK_VERSION as well */
-        version "4.0.8"
+        versionCode 40009
+        versionName "4.0.9" /* Update in BoxConfig.SDK_VERSION as well */
+        version "4.0.9"
         group "com.box"
     }
 

diff --git a/box-content-sdk/src/main/java/com/box/androidsdk/content/BoxConfig.java b/box-content-sdk/src/main/java/com/box/androidsdk/content/BoxConfig.java
@@ -74,7 +74,7 @@ public static BoxCache getCache() {
     /**
      * Version string
      */
-    public static String SDK_VERSION = "4.0.8";
+    public static String SDK_VERSION = "4.0.9";
 
     /**
      * Optional paramater for whether authentication should use

diff --git a/box-content-sdk/src/main/java/com/box/androidsdk/content/utils/SdkUtils.java b/box-content-sdk/src/main/java/com/box/androidsdk/content/utils/SdkUtils.java
@@ -636,7 +636,7 @@ public static int calculateInSampleSize(BitmapFactory.Options options, int reqWi
 
 
 
-    private static String SIZE_BYTES = "%4f B";
+    private static String SIZE_BYTES = "%4.0f B";
     private static String SIZE_KILOBYTES = "%4.1f KB";
     private static String SIZE_MEGABYTES = "%4.1f MB";
     private static String SIZE_GIGABYTES = "%4.1f GB";
@@ -647,8 +647,8 @@ public static int calculateInSampleSize(BitmapFactory.Options options, int reqWi
 
     private static final int constKB = 1024;
     private static final int constMB = constKB * constKB;
-    private static final int constGB = constMB * constKB;
-    private static final int constTB = constGB * constKB;
+    private static final double constGB = constMB * constKB;
+    private static final double constTB = constGB * constKB;
 
     private static final double floatKB = 1024.0f;
     private static final double floatMB = floatKB * floatKB;
@@ -657,7 +657,7 @@ public static int calculateInSampleSize(BitmapFactory.Options options, int reqWi
 
     /**
      * Java version of routine to turn a long into a short user readable string.
-     * <p/>
+     *
      * This routine is used if the JNI native C version is not available.
      *
      * @param numSize the number of bytes in the file.

diff --git a/box-content-sdk/src/main/res/values/strings.xml b/box-content-sdk/src/main/res/values/strings.xml
@@ -75,7 +75,7 @@
 
 
 
-    <string name="boxsdk_bytes" description="size with abbreviation for bytes used in folder list">%4f B</string>
+    <string name="boxsdk_bytes" description="size with abbreviation for bytes used in folder list">%4.0f B</string>
     <string name="boxsdk_kilobytes" description="size in binary kilobytes  1024 bytes used in folder list">%4.1f KB</string>
     <string name="boxsdk_megabytes" description="size in binary megabyte  1024 * 1024 kbytes used in folder list">%4.1f MB</string>
     <string name="boxsdk_gigabytes" description="size in binary gigabyte  1024 * 1024 mbytes used in folder list">%4.1f GB</string>