From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 12 Oct 2015 18:21:19 +0000 (+0200)
Subject: cache size is read from cache on preference start
X-Git-Tag: beta-20151129~5^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/981ecb91c9550958161bda9fa1b44c207f99567d

cache size is read from cache on preference start
---

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index d1be900a..143d8206 100644
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -154,6 +154,14 @@ public class ThumbnailsCacheManager {
         }
     }
 
+    public static long getMaxSize(){
+        if (mThumbnailCache != null) {
+            return mThumbnailCache.getMaxSize();
+        } else {
+            return -1l;
+        }
+    }
+
     public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitmap> {
         private final WeakReference<ImageView> mImageViewReference;
         private static Account mAccount;
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 16bee151..f74da5aa 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -242,8 +242,8 @@ public class Preferences extends PreferenceActivity
         if (pCacheSize != null){
             final SharedPreferences appPrefs =
                     PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            String savedSize = appPrefs.getString("pref_cache_size", "10");
-            pCacheSize.setSummary(savedSize + " Mb");
+            Long cacheSize = ThumbnailsCacheManager.getMaxSize();
+            pCacheSize.setSummary(cacheSize + " Mb");
             pCacheSize.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java b/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
index b5c04034..6fd5c5dc 100644
--- a/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
+++ b/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
@@ -197,4 +197,8 @@ public class DiskLruImageCache {
     public void setMaxSize(long maxSize){
         mDiskCache.setMaxSize(maxSize);
     }
+
+    public long getMaxSize(){
+        return mDiskCache.getMaxSize();
+    }
 }
\ No newline at end of file