diff --git a/catvod/src/main/java/com/github/catvod/net/cookie/WrappedCookie.java b/catvod/src/main/java/com/github/catvod/bean/WrappedCookie.java similarity index 97% rename from catvod/src/main/java/com/github/catvod/net/cookie/WrappedCookie.java rename to catvod/src/main/java/com/github/catvod/bean/WrappedCookie.java index 1d34114ea..bb92e38a6 100644 --- a/catvod/src/main/java/com/github/catvod/net/cookie/WrappedCookie.java +++ b/catvod/src/main/java/com/github/catvod/bean/WrappedCookie.java @@ -1,4 +1,4 @@ -package com.github.catvod.net.cookie; +package com.github.catvod.bean; import okhttp3.Cookie; import okhttp3.HttpUrl; diff --git a/catvod/src/main/java/com/github/catvod/net/cookie/MemoryCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java similarity index 91% rename from catvod/src/main/java/com/github/catvod/net/cookie/MemoryCookieJar.java rename to catvod/src/main/java/com/github/catvod/net/OkCookieJar.java index a0b71b8af..90ebfd969 100644 --- a/catvod/src/main/java/com/github/catvod/net/cookie/MemoryCookieJar.java +++ b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java @@ -1,10 +1,12 @@ -package com.github.catvod.net.cookie; +package com.github.catvod.net; import android.text.TextUtils; import android.webkit.CookieManager; import androidx.annotation.NonNull; +import com.github.catvod.bean.WrappedCookie; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -14,12 +16,12 @@ import okhttp3.Cookie; import okhttp3.CookieJar; import okhttp3.HttpUrl; -public class MemoryCookieJar implements CookieJar { +public class OkCookieJar implements CookieJar { private final Set cache; private final CookieManager manager; - public MemoryCookieJar() { + public OkCookieJar() { cache = new HashSet<>(); manager = CookieManager.getInstance(); } 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 74c2ea44b..e27fc8571 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -5,7 +5,6 @@ import android.text.TextUtils; import androidx.collection.ArrayMap; import com.github.catvod.bean.Doh; -import com.github.catvod.net.cookie.MemoryCookieJar; import com.github.catvod.utils.Path; import java.net.ProxySelector; @@ -132,7 +131,7 @@ public class OkHttp { } private static OkHttpClient.Builder getBuilder() { - OkHttpClient.Builder builder = new OkHttpClient.Builder().addNetworkInterceptor(new OkInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).followRedirects(true).cookieJar(new MemoryCookieJar()).sslSocketFactory(new SSLCompat(), SSLCompat.TM); + OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(new OkCookieJar()).addNetworkInterceptor(new OkInterceptor()).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; }