From de5da768d33884e4af7b7cb8cb309a1e76eb6aca Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 2 May 2025 21:05:24 +0800 Subject: [PATCH] Clean code --- .../src/main/java/com/github/catvod/net/OkCookieJar.java | 7 +++++++ .../catvod/net/interceptor/RequestInterceptor.java | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java index fbca5a2f1..7e28dabfc 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java +++ b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java @@ -6,6 +6,8 @@ import android.webkit.WebView; import androidx.annotation.NonNull; +import com.google.common.net.HttpHeaders; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -13,6 +15,7 @@ import java.util.List; import okhttp3.Cookie; import okhttp3.CookieJar; import okhttp3.HttpUrl; +import okhttp3.Request; public class OkCookieJar implements CookieJar { @@ -40,6 +43,10 @@ public class OkCookieJar implements CookieJar { } } + public static void sync(HttpUrl url, Request request) { + if (!"127.0.0.1".equals(url.host())) sync(url.toString(), request.header(HttpHeaders.COOKIE)); + } + public static void sync(String url, String cookie) { try { if (TextUtils.isEmpty(cookie)) return; diff --git a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java index 8706c7dc1..20f6cab42 100644 --- a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java +++ b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java @@ -4,7 +4,6 @@ import androidx.annotation.NonNull; import com.github.catvod.net.OkCookieJar; import com.github.catvod.utils.Json; -import com.google.common.net.HttpHeaders; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -44,11 +43,11 @@ public class RequestInterceptor implements Interceptor { @Override public Response intercept(@NonNull Chain chain) throws IOException { Request request = chain.request(); - HttpUrl url = request.url(); Request.Builder builder = request.newBuilder(); + HttpUrl url = request.url(); + checkAuth(url, builder); checkHeader(url, builder); - checkAuthUser(url, builder); - OkCookieJar.sync(url.toString(), request.header(HttpHeaders.COOKIE)); + OkCookieJar.sync(url, request); return chain.proceed(builder.build()); } @@ -59,7 +58,7 @@ public class RequestInterceptor implements Interceptor { } } - private void checkAuthUser(HttpUrl url, Request.Builder builder) { + private void checkAuth(HttpUrl url, Request.Builder builder) { String auth = url.queryParameter("auth"); if (auth != null) authMap.put(url.host(), auth); if (authMap.containsKey(url.host()) && auth == null) builder.url(url.newBuilder().addQueryParameter("auth", authMap.get(url.host())).build());