From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 18 Nov 2015 12:19:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/beta' into beta
X-Git-Tag: beta-20151122~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/87db47a9004f1fe55032793069b498c6c5dc2e93?hp=cdeb9e0fcea3dfe8b952ee3e7f48dddbecd6403a

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 10dfbd71..70730fd2 100644
--- 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;
         }