pull/362/head
FongMi 2 years ago
parent 8b5c7b2dd5
commit c0bfa23180
  1. 2
      catvod/src/main/java/com/github/catvod/bean/WrappedCookie.java
  2. 8
      catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
  3. 3
      catvod/src/main/java/com/github/catvod/net/OkHttp.java

@ -1,4 +1,4 @@
package com.github.catvod.net.cookie; package com.github.catvod.bean;
import okhttp3.Cookie; import okhttp3.Cookie;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;

@ -1,10 +1,12 @@
package com.github.catvod.net.cookie; package com.github.catvod.net;
import android.text.TextUtils; import android.text.TextUtils;
import android.webkit.CookieManager; import android.webkit.CookieManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.github.catvod.bean.WrappedCookie;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -14,12 +16,12 @@ import okhttp3.Cookie;
import okhttp3.CookieJar; import okhttp3.CookieJar;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
public class MemoryCookieJar implements CookieJar { public class OkCookieJar implements CookieJar {
private final Set<WrappedCookie> cache; private final Set<WrappedCookie> cache;
private final CookieManager manager; private final CookieManager manager;
public MemoryCookieJar() { public OkCookieJar() {
cache = new HashSet<>(); cache = new HashSet<>();
manager = CookieManager.getInstance(); manager = CookieManager.getInstance();
} }

@ -5,7 +5,6 @@ import android.text.TextUtils;
import androidx.collection.ArrayMap; import androidx.collection.ArrayMap;
import com.github.catvod.bean.Doh; import com.github.catvod.bean.Doh;
import com.github.catvod.net.cookie.MemoryCookieJar;
import com.github.catvod.utils.Path; import com.github.catvod.utils.Path;
import java.net.ProxySelector; import java.net.ProxySelector;
@ -132,7 +131,7 @@ public class OkHttp {
} }
private static OkHttpClient.Builder getBuilder() { 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); builder.proxySelector(get().proxy ? selector() : defaultSelector);
return builder; return builder;
} }

Loading…
Cancel
Save