diff --git a/catvod/src/main/java/com/github/catvod/net/CookieJar.java b/catvod/src/main/java/com/github/catvod/net/CookieJar.java deleted file mode 100644 index 2887a1868..000000000 --- a/catvod/src/main/java/com/github/catvod/net/CookieJar.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.github.catvod.net; - -import android.text.TextUtils; -import android.webkit.CookieManager; - -import androidx.annotation.NonNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import okhttp3.Cookie; -import okhttp3.HttpUrl; - -public class CookieJar implements okhttp3.CookieJar { - - private static class Loader { - static volatile CookieJar INSTANCE = new CookieJar(); - } - - public static CookieJar get() { - return Loader.INSTANCE; - } - - private final CookieManager manager; - - public CookieJar() { - manager = CookieManager.getInstance(); - } - - @Override - public void saveFromResponse(@NonNull HttpUrl url, List cookies) { - for (Cookie cookie : cookies) manager.setCookie(url.toString(), cookie.toString()); - } - - @NonNull - @Override - public List loadForRequest(@NonNull HttpUrl url) { - return get(url); - } - - public List get(HttpUrl url) { - String cookie = manager.getCookie(url.toString()); - if (cookie == null || cookie.isEmpty()) return Collections.emptyList(); - List items = new ArrayList<>(); - for (String text : cookie.split(";")) items.add(Cookie.parse(url, text.trim())); - return items; - } - - public void remove(HttpUrl url, List cookieNames, int maxAge) { - String cookie = manager.getCookie(url.toString()); - if (TextUtils.isEmpty(cookie)) return; - List filter = cookieNames != null ? cookieNames : Arrays.asList(cookie.split(";")); - for (String text : filter) manager.setCookie(url.toString(), text + "=;Max-Age=" + maxAge); - } - - public void removeAll() { - manager.removeAllCookies(null); - } -} \ 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 7eadebb8f..de7bd47f4 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -141,7 +141,7 @@ public class OkHttp { } private static OkHttpClient.Builder getBuilder() { - 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); + OkHttpClient.Builder builder = new OkHttpClient.Builder().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; }