Merge pull request #1054 from TomHennen/fix1053

Fixes pictures disappearing in some cases

2 files changed, 14 insertions, 4 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
index 433ba8db4..c7ac146b5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 
 import de.danoeh.antennapod.core.ClientConfig;
+import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.service.download.HttpDownloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.NetworkUtils;
@@ -42,7 +43,7 @@ public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
             if (internalClient == null) {
                 synchronized (Factory.class) {
                     if (internalClient == null) {
-                        internalClient = new OkHttpClient();
+                        internalClient = AntennapodHttpClient.getHttpClient();
                         internalClient.interceptors().add(new NetworkAllowanceInterceptor());
                         internalClient.interceptors().add(new BasicAuthenticationInterceptor());
                     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 789a2366e..d56829c70 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -85,6 +85,8 @@ public class UserPreferences {
     private static final String PREF_FAST_FORWARD_SECS = "prefFastForwardSecs";
     private static final String PREF_REWIND_SECS = "prefRewindSecs";
     public static final String PREF_QUEUE_LOCKED = "prefQueueLocked";
+    public static final String IMAGE_CACHE_DEFAULT_VALUE = "100";
+    public static final int IMAGE_CACHE_SIZE_MINIMUM = 20;
 
     // Constants
     private static int EPISODE_CACHE_SIZE_UNLIMITED = -1;
@@ -279,9 +281,16 @@ public class UserPreferences {
     }
 
     public static int getImageCacheSize() {
-        String cacheSizeString = prefs.getString(PREF_IMAGE_CACHE_SIZE, "100");
-        int cacheSize = Integer.valueOf(cacheSizeString) * 1024 * 1024;
-        return cacheSize;
+        String cacheSizeString = prefs.getString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE);
+        int cacheSizeInt = Integer.valueOf(cacheSizeString);
+        // if the cache size is too small the user won't get any images at all
+        // that's bad, force it back to the default.
+        if (cacheSizeInt < IMAGE_CACHE_SIZE_MINIMUM) {
+            prefs.edit().putString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE).apply();
+            cacheSizeInt = Integer.valueOf(IMAGE_CACHE_DEFAULT_VALUE);
+        }
+        int cacheSizeMB = cacheSizeInt * 1024 * 1024;
+        return cacheSizeMB;
     }
 
     public static int getFastFowardSecs() {