Add debug setting

pull/586/head
FongMi 10 months ago
parent 50a47c0786
commit 1bdcb8a75a
  1. 1
      app/src/main/java/com/fongmi/android/tv/App.java
  2. 9
      catvod/src/main/java/com/github/catvod/net/OkHttp.java

@ -115,6 +115,7 @@ public class App extends Application {
super.onCreate();
Notify.createChannel();
Logger.addLogAdapter(getLogAdapter());
OkHttp.get().setDebug(BuildConfig.DEBUG);
OkHttp.get().setProxy(Setting.getProxy());
OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));
EventBus.builder().addIndex(new EventIndex()).installDefaultEventBus();

@ -45,6 +45,7 @@ public class OkHttp {
private OkDns dns;
private boolean proxy;
private boolean debug;
static {
defaultSelector = ProxySelector.getDefault();
@ -58,6 +59,10 @@ public class OkHttp {
return Loader.INSTANCE;
}
public void setDebug(boolean debug) {
this.debug = debug;
}
public void setDoh(Doh doh) {
OkHttpClient c = new OkHttpClient.Builder().cache(new Cache(Path.doh(), CACHE)).build();
dns().setDoh(doh.getUrl().isEmpty() ? null : new DnsOverHttps.Builder().client(c).url(HttpUrl.get(doh.getUrl())).bootstrapDnsHosts(doh.getHosts()).build());
@ -163,10 +168,10 @@ public class OkHttp {
}
private static OkHttpClient.Builder getBuilder() {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY);
OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(OkCookieJar.get()).addInterceptor(requestInterceptor()).addNetworkInterceptor(responseInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).sslSocketFactory(getSSLContext().getSocketFactory(), trustAllCertificates());
HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY);
builder.proxySelector(get().proxy ? selector() : defaultSelector);
//builder.addNetworkInterceptor(logging);
if (get().debug) builder.addNetworkInterceptor(logging);
return builder;
}

Loading…
Cancel
Save