From 875deffb62cec539ca324fb30828ceb72d233c96 Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Tue, 4 Nov 2025 01:22:45 +0800
Subject: [PATCH] Clean code

---
 .../fongmi/android/tv/ui/activity/SettingActivity.java    | 2 +-
 app/src/main/java/com/fongmi/android/tv/App.java          | 2 +-
 .../fongmi/android/tv/ui/fragment/SettingFragment.java    | 2 +-
 catvod/src/main/java/com/github/catvod/net/OkDns.java     | 8 ++++++--
 catvod/src/main/java/com/github/catvod/net/OkHttp.java    | 8 --------
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
index 5ce2bc1c1..7949e0bef 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
@@ -281,7 +281,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
 
     @Override
     public void setDoh(Doh doh) {
-        OkHttp.get().setDoh(doh);
+        OkHttp.dns().setDoh(doh);
         Setting.putDoh(doh.toString());
         mBinding.dohText.setText(doh.getName());
         VodConfig.load(Config.vod(), getCallback(0));
diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java
index bf7f7c98b..952d88492 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
@@ -131,7 +131,7 @@ public class App extends Application {
         super.onCreate();
         Notify.createChannel();
         Logger.addLogAdapter(getLogAdapter());
-        OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));
+        OkHttp.dns().setDoh(Doh.objectFrom(Setting.getDoh()));
         EventBus.builder().addIndex(new EventIndex()).installDefaultEventBus();
         CaocConfig.Builder.create().trackActivities(true).backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT).errorActivity(CrashActivity.class).apply();
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
index 41aa95082..397a6081a 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
@@ -292,7 +292,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
     }
 
     private void setDoh(Doh doh) {
-        OkHttp.get().setDoh(doh);
+        OkHttp.dns().setDoh(doh);
         Setting.putDoh(doh.toString());
         mBinding.dohText.setText(doh.getName());
         VodConfig.load(Config.vod(), getCallback(0));
diff --git a/catvod/src/main/java/com/github/catvod/net/OkDns.java b/catvod/src/main/java/com/github/catvod/net/OkDns.java
index 37ddad6fa..21f6ab59a 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkDns.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkDns.java
@@ -2,6 +2,7 @@ package com.github.catvod.net;
 
 import androidx.annotation.NonNull;
 
+import com.github.catvod.bean.Doh;
 import com.github.catvod.utils.Util;
 
 import java.net.InetAddress;
@@ -11,6 +12,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import okhttp3.Dns;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import okhttp3.dnsoverhttps.DnsOverHttps;
 
 public class OkDns implements Dns {
@@ -22,8 +25,9 @@ public class OkDns implements Dns {
         this.map = new ConcurrentHashMap<>();
     }
 
-    public void setDoh(DnsOverHttps doh) {
-        this.doh = doh;
+    public void setDoh(Doh item) {
+        if (item.getUrl().isEmpty()) return;
+        this.doh = new DnsOverHttps.Builder().client(new OkHttpClient()).url(HttpUrl.get(item.getUrl())).bootstrapDnsHosts(item.getHosts()).build();
     }
 
     public void clear() {
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 21cf624cf..d2c071ceb 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 
 import androidx.collection.ArrayMap;
 
-import com.github.catvod.bean.Doh;
 import com.github.catvod.net.interceptor.AuthInterceptor;
 import com.github.catvod.net.interceptor.RequestInterceptor;
 import com.github.catvod.net.interceptor.ResponseInterceptor;
@@ -27,7 +26,6 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.dnsoverhttps.DnsOverHttps;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class OkHttp {
@@ -61,12 +59,6 @@ public class OkHttp {
         responseInterceptor().clear();
     }
 
-    public void setDoh(Doh doh) {
-        dns().setDoh(doh.getUrl().isEmpty() ? null : new DnsOverHttps.Builder().client(new OkHttpClient()).url(HttpUrl.get(doh.getUrl())).bootstrapDnsHosts(doh.getHosts()).build());
-        client = null;
-        player = null;
-    }
-
     public static OkDns dns() {
         if (get().dns != null) return get().dns;
         return get().dns = new OkDns();