From f79e5f0f2f3714f4ddd4f9d217496c391f42d759 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 10 Jan 2024 23:43:55 +0800
Subject: [PATCH] Clean code

---
 catvod/src/main/java/com/github/catvod/net/OkHttp.java   | 3 ++-
 .../DefaultInterceptor.java}                             | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename catvod/src/main/java/com/github/catvod/net/{OkhttpInterceptor.java => interceptor/DefaultInterceptor.java} (87%)

diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
index 36848cab8..7eadebb8f 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -6,6 +6,7 @@ import android.text.TextUtils;
 import androidx.collection.ArrayMap;
 
 import com.github.catvod.bean.Doh;
+import com.github.catvod.net.interceptor.DefaultInterceptor;
 import com.github.catvod.utils.Path;
 import com.github.catvod.utils.Util;
 import com.google.common.net.HttpHeaders;
@@ -140,7 +141,7 @@ public class OkHttp {
     }
 
     private static OkHttpClient.Builder getBuilder() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(CookieJar.get()).addInterceptor(new OkhttpInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).sslSocketFactory(new SSLCompat(), SSLCompat.TM);
+        OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(CookieJar.get()).addInterceptor(new DefaultInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).sslSocketFactory(new SSLCompat(), SSLCompat.TM);
         builder.proxySelector(get().proxy ? selector() : defaultSelector);
         return builder;
     }
diff --git a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
similarity index 87%
rename from catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java
rename to catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
index 1d5d5602b..bd24587b1 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java
+++ b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java
@@ -1,4 +1,4 @@
-package com.github.catvod.net;
+package com.github.catvod.net.interceptor;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -18,12 +18,12 @@ import okhttp3.ResponseBody;
 import okio.BufferedSource;
 import okio.Okio;
 
-public class OkhttpInterceptor implements Interceptor {
+public class DefaultInterceptor implements Interceptor {
 
     @NonNull
     @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
-        Response response = chain.proceed(getRequest(chain));
+        Response response = chain.proceed(getRequest(chain.request()));
         String encoding = response.header(HttpHeaders.CONTENT_ENCODING);
         if (response.body() == null || encoding == null || !encoding.equals("deflate")) return response;
         InflaterInputStream is = new InflaterInputStream(response.body().byteStream(), new Inflater(true));
@@ -47,8 +47,7 @@ public class OkhttpInterceptor implements Interceptor {
         }).build();
     }
 
-    private Request getRequest(@NonNull Chain chain) {
-        Request request = chain.request();
+    private Request getRequest(@NonNull Request request) {
         String url = request.url().toString();
         Request.Builder builder = request.newBuilder();
         if (url.contains("+")) builder.url(url.replace("+", "%2B"));