Merge remote-tracking branch 'upstream/beta' into beta

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 10dfbd7..70730fd 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -166,9 +166,13 @@ public class ThumbnailsCacheManager {
         }
     }
 
+    /**
+     * Shows max cache size
+     * @return max cache size in MB.
+     */
     public static long getMaxSize(){
         if (mThumbnailCache != null) {
-            return mThumbnailCache.getMaxSize();
+            return mThumbnailCache.getMaxSize() / 1024 / 1024;
         } else {
             return -1l;
         }