From 66038baa2ece1b187466342747cc799bc29591d5 Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Sun, 2 Jun 2024 13:57:08 +0800
Subject: [PATCH] remove CookieJar

---
 .../com/github/catvod/net/OkCookieJar.java    | 76 -------------------
 .../java/com/github/catvod/net/OkHttp.java    |  2 +-
 .../net/interceptor/RequestInterceptor.java   |  2 -
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 catvod/src/main/java/com/github/catvod/net/OkCookieJar.java

diff --git a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
deleted file mode 100644
index 0b56f4e9e..000000000
--- a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.catvod.net;
-
-import android.text.TextUtils;
-import com.tencent.smtt.sdk.CookieManager;
-import com.tencent.smtt.sdk.WebView;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import okhttp3.Cookie;
-import okhttp3.CookieJar;
-import okhttp3.HttpUrl;
-
-public class OkCookieJar implements CookieJar {
-
-    private CookieManager manager;
-
-    private static class Loader {
-        static volatile OkCookieJar INSTANCE = new OkCookieJar();
-    }
-
-    public static OkCookieJar get() {
-        return Loader.INSTANCE;
-    }
-
-    private OkCookieJar() {
-        try {
-            manager = CookieManager.getInstance();
-        } catch (Throwable ignored) {
-        }
-    }
-
-    public static void setAcceptThirdPartyCookies(WebView view) {
-        try {
-            get().manager.setAcceptThirdPartyCookies(view, true);
-        } catch (Throwable ignored) {
-        }
-    }
-
-    public static void sync(String url, String cookie) {
-        try {
-            if (TextUtils.isEmpty(cookie)) return;
-            for (String split : cookie.split(";")) get().manager.setCookie(url, split);
-        } catch (Throwable ignored) {
-        }
-    }
-
-    private void add(List<Cookie> items, Cookie cookie) {
-        if (cookie != null) items.add(cookie);
-    }
-
-    @NonNull
-    @Override
-    public synchronized List<Cookie> loadForRequest(@NonNull HttpUrl url) {
-        try {
-            List<Cookie> items = new ArrayList<>();
-            String cookie = manager.getCookie(url.toString());
-            if (TextUtils.isEmpty(cookie)) return Collections.emptyList();
-            for (String split : cookie.split(";")) add(items, Cookie.parse(url, split));
-            return items;
-        } catch (Throwable e) {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public synchronized void saveFromResponse(@NonNull HttpUrl url, @NonNull List<Cookie> cookies) {
-        try {
-            for (Cookie cookie : cookies) manager.setCookie(url.toString(), cookie.toString());
-        } catch (Throwable ignored) {
-        }
-    }
-}
\ No newline at end of file
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 37d27bbb2..58f18a1ab 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -142,7 +142,7 @@ public class OkHttp {
     }
 
     private static OkHttpClient.Builder getBuilder() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(OkCookieJar.get()).addInterceptor(new RequestInterceptor()).addNetworkInterceptor(new ResponseInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).followRedirects(true).sslSocketFactory(new SSLCompat(), SSLCompat.TM);
+        OkHttpClient.Builder builder = new OkHttpClient.Builder().addInterceptor(new RequestInterceptor()).addNetworkInterceptor(new ResponseInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).followRedirects(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/interceptor/RequestInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java
index e010d0898..34ad0e7d7 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
@@ -3,7 +3,6 @@ package com.github.catvod.net.interceptor;
 import androidx.annotation.NonNull;
 
 import com.github.catvod.Proxy;
-import com.github.catvod.net.OkCookieJar;
 import com.github.catvod.utils.Util;
 import com.google.common.net.HttpHeaders;
 
@@ -23,7 +22,6 @@ public class RequestInterceptor implements Interceptor {
         URI uri = request.url().uri();
         String url = request.url().toString();
         Request.Builder builder = request.newBuilder();
-        OkCookieJar.sync(url, request.header(HttpHeaders.COOKIE));
         boolean local = url.contains(":" + Proxy.getPort() + "/");
         if (url.contains("+") && local) builder.url(url.replace("+", "%2B"));
         if (url.contains("gitcode.net")) builder.header(HttpHeaders.USER_AGENT, Util.CHROME);