From 3167c7a5d2333d94b81edc6d6b567bd4facad1ed Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 16 Mar 2020 01:09:32 +0100
Subject: [PATCH] Always add UserAgent to requests

---
 .../discovery/ItunesPodcastSearcher.java      |  3 +--
 .../discovery/ItunesTopListLoader.java        |  4 +---
 .../core/glide/ChapterImageModelLoader.java   |  1 -
 .../core/gpoddernet/GpodnetService.java       |  7 +++----
 .../core/service/UserAgentInterceptor.java    | 20 +++++++++++++++++++
 .../download/AntennapodHttpClient.java        |  2 ++
 .../core/service/download/HttpDownloader.java |  3 +--
 7 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/de/danoeh/antennapod/core/service/UserAgentInterceptor.java

diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java
index a91aae1a8..620b30177 100644
--- a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java
@@ -43,8 +43,7 @@ public class ItunesPodcastSearcher implements PodcastSearcher {
 
             OkHttpClient client = AntennapodHttpClient.getHttpClient();
             Request.Builder httpReq = new Request.Builder()
-                    .url(formattedUrl)
-                    .header("User-Agent", ClientConfig.USER_AGENT);
+                    .url(formattedUrl);
             List<PodcastSearchResult> podcasts = new ArrayList<>();
             try {
                 Response response = client.newCall(httpReq.build()).execute();
diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
index bb0e165b7..eb6589b84 100644
--- a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
+++ b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java
@@ -57,8 +57,7 @@ public class ItunesTopListLoader {
         return Single.create((SingleOnSubscribe<String>) emitter -> {
             OkHttpClient client = AntennapodHttpClient.getHttpClient();
             Request.Builder httpReq = new Request.Builder()
-                    .url(podcast.feedUrl)
-                    .header("User-Agent", ClientConfig.USER_AGENT);
+                    .url(podcast.feedUrl);
             try {
                 Response response = client.newCall(httpReq.build()).execute();
                 if (response.isSuccessful()) {
@@ -84,7 +83,6 @@ public class ItunesTopListLoader {
         Log.d(TAG, "Feed URL " + String.format(url, country));
         Request.Builder httpReq = new Request.Builder()
                 .cacheControl(new CacheControl.Builder().minFresh(1, TimeUnit.DAYS).build())
-                .header("User-Agent", ClientConfig.USER_AGENT)
                 .url(String.format(url, country));
 
         try (Response response = client.newCall(httpReq.build()).execute()) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ChapterImageModelLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ChapterImageModelLoader.java
index bc0a06a07..36da11eca 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ChapterImageModelLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ChapterImageModelLoader.java
@@ -71,7 +71,6 @@ public final class ChapterImageModelLoader implements ModelLoader<EmbeddedChapte
                     callback.onDataReady(ByteBuffer.wrap(imageContent));
                 } else {
                     Request.Builder httpReq = new Request.Builder();
-                    httpReq.header("User-Agent", ClientConfig.USER_AGENT);
                     // Skipping would download the whole file
                     httpReq.header("Range", "bytes=" + image.getPosition()
                             + "-" + (image.getPosition() + image.getLength()));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
index 9ee8c0fc1..97931237a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
@@ -554,9 +554,8 @@ public class GpodnetService {
         }.start();
     }
 
-    private String executeRequest(@NonNull Request.Builder requestB)
-            throws GpodnetServiceException {
-        Request request = requestB.header("User-Agent", ClientConfig.USER_AGENT).build();
+    private String executeRequest(@NonNull Request.Builder requestB) throws GpodnetServiceException {
+        Request request = requestB.build();
         String responseString = null;
         Response response = null;
         ResponseBody body = null;
@@ -584,7 +583,7 @@ public class GpodnetService {
                     "request and credentials must not be null");
         }
 
-        Request request = requestB.header("User-Agent", ClientConfig.USER_AGENT).build();
+        Request request = requestB.build();
         String result = null;
         ResponseBody body = null;
         try {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/UserAgentInterceptor.java b/core/src/main/java/de/danoeh/antennapod/core/service/UserAgentInterceptor.java
new file mode 100644
index 000000000..5fcf8317d
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/UserAgentInterceptor.java
@@ -0,0 +1,20 @@
+package de.danoeh.antennapod.core.service;
+
+import de.danoeh.antennapod.core.ClientConfig;
+import okhttp3.Interceptor;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class UserAgentInterceptor implements Interceptor {
+
+    public UserAgentInterceptor() {
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        return chain.proceed(chain.request().newBuilder()
+                .header("User-Agent", ClientConfig.USER_AGENT)
+                .build());
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index ee0f8bd95..e0c23bdac 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -32,6 +32,7 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.UserAgentInterceptor;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import okhttp3.Cache;
 import okhttp3.CipherSuite;
@@ -116,6 +117,7 @@ public class AntennapodHttpClient {
             return response;
         });
         builder.interceptors().add(new BasicAuthorizationInterceptor());
+        builder.networkInterceptors().add(new UserAgentInterceptor());
 
         // set cookie handler
         CookieManager cm = new CookieManager();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index 46b8568c5..54b8d321a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -63,8 +63,7 @@ public class HttpDownloader extends Downloader {
 
         try {
             final URI uri = URIUtil.getURIFromRequestUrl(request.getSource());
-            Request.Builder httpReq = new Request.Builder().url(uri.toURL())
-                    .header("User-Agent", ClientConfig.USER_AGENT);
+            Request.Builder httpReq = new Request.Builder().url(uri.toURL());
             httpReq.tag(request);
             if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
                 // set header explicitly so that okhttp doesn't do transparent gzip