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

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / ThumbnailsCacheManager.java

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 10dfbd7..8c36fa2 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) {
     public static long getMaxSize(){
         if (mThumbnailCache != null) {

-            return mThumbnailCache.getMaxSize();
+            return mThumbnailCache.getMaxSize() / 1024 / 1024;

         } else {
             return -1l;
         }
         } else {
             return -1l;
         }


@@ -267,7 +271,7 @@ public class ThumbnailsCacheManager {
                             }
                         }
                         imageView.setImageBitmap(bitmap);
                             }
                         }
                         imageView.setImageBitmap(bitmap);

-                        imageView.setVisibility(View.VISIBLE);
+                        // imageView.setVisibility(View.VISIBLE);

                     }
                 }
             }
                     }
                 }
             }