From 9ff46878212874bdcb7274c77c78e13613d5689d Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 18 Mar 2020 00:08:13 +0100
Subject: Do not cache images, accept old iTunes responses

---
 .../antennapod/core/glide/ApOkHttpUrlLoader.java   | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'core/src/main/java/de')

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 8a13944e1..071b1d0c9 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
@@ -1,41 +1,31 @@
 package de.danoeh.antennapod.core.glide;
 
+import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
-
 import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
-
-import de.danoeh.antennapod.core.service.BasicAuthorizationInterceptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 import com.bumptech.glide.signature.ObjectKey;
 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;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
-import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * @see com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
  */
 class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
 
-    private static final String TAG = ApOkHttpUrlLoader.class.getSimpleName();
-
     /**
      * The default factory for {@link ApOkHttpUrlLoader}s.
      */
@@ -50,6 +40,7 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
                     if (internalClient == null) {
                         OkHttpClient.Builder builder = AntennapodHttpClient.newBuilder();
                         builder.interceptors().add(new NetworkAllowanceInterceptor());
+                        builder.cache(null); // Handled by Glide
                         internalClient = builder.build();
                     }
                 }
@@ -109,8 +100,9 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
 
     private static class NetworkAllowanceInterceptor implements Interceptor {
 
+        @NonNull
         @Override
-        public Response intercept(Chain chain) throws IOException {
+        public Response intercept(@NonNull Chain chain) throws IOException {
             if (NetworkUtils.isImageAllowed()) {
                 return chain.proceed(chain.request());
             } else {
-- 
cgit v1.2.3