From 1bdd3f53a34b0e5620a6dd388d54ed22a80e5003 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 21 May 2023 21:30:25 +0800
Subject: [PATCH] Support doh - part 6

---
 .../java/com/fongmi/android/tv/api/ApiConfig.java  |  4 ++--
 .../src/main/java/com/github/catvod/bean/Doh.java  | 13 +++++++++++--
 catvod/src/main/res/values-zh-rCN/strings.xml      | 14 +++++++++++++-
 catvod/src/main/res/values-zh-rTW/strings.xml      | 14 +++++++++++++-
 catvod/src/main/res/values/strings.xml             | 14 +++++++++++++-
 5 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index 7bf89dcd2..f13d12927 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -261,8 +261,8 @@ public class ApiConfig {
     }
 
     public List<Doh> getDoh() {
-        List<Doh> items = new ArrayList<>();
-        items.add(Doh.system(App.get()));
+        List<Doh> items = Doh.get(App.get());
+        items.removeAll(doh);
         items.addAll(doh);
         return items;
     }
diff --git a/catvod/src/main/java/com/github/catvod/bean/Doh.java b/catvod/src/main/java/com/github/catvod/bean/Doh.java
index a33a964e9..0d663de9c 100644
--- a/catvod/src/main/java/com/github/catvod/bean/Doh.java
+++ b/catvod/src/main/java/com/github/catvod/bean/Doh.java
@@ -26,8 +26,12 @@ public class Doh {
     @SerializedName("ips")
     private List<String> ips;
 
-    public static Doh system(Context context) {
-        return new Doh().name(context.getString(R.string.system));
+    public static List<Doh> get(Context context) {
+        List<Doh> items = new ArrayList<>();
+        String[] urls = context.getResources().getStringArray(R.array.doh_url);
+        String[] names = context.getResources().getStringArray(R.array.doh_name);
+        for (int i = 0; i < names.length; i++) items.add(new Doh().name(names[i]).url(urls[i]));
+        return items;
     }
 
     public static Doh objectFrom(String str) {
@@ -46,6 +50,11 @@ public class Doh {
         return this;
     }
 
+    public Doh url(String url) {
+        this.url = url;
+        return this;
+    }
+
     public String getName() {
         return TextUtils.isEmpty(name) ? "" : name;
     }
diff --git a/catvod/src/main/res/values-zh-rCN/strings.xml b/catvod/src/main/res/values-zh-rCN/strings.xml
index 0021a4f26..4494779cd 100644
--- a/catvod/src/main/res/values-zh-rCN/strings.xml
+++ b/catvod/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="system">系统</string>
+    <string-array name="doh_name">
+        <item>系统</item>
+        <item>腾讯</item>
+        <item>阿里</item>
+        <item>360</item>
+    </string-array>
+
+    <string-array name="doh_url">
+        <item />
+        <item>https://doh.pub/dns-query</item>
+        <item>https://dns.alidns.com/dns-query</item>
+        <item>https://doh.360.cn/dns-query</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/catvod/src/main/res/values-zh-rTW/strings.xml b/catvod/src/main/res/values-zh-rTW/strings.xml
index 73be7cfd2..d9005be25 100644
--- a/catvod/src/main/res/values-zh-rTW/strings.xml
+++ b/catvod/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="system">系統</string>
+    <string-array name="doh_name">
+        <item>系統</item>
+        <item>騰訊</item>
+        <item>阿里</item>
+        <item>360</item>
+    </string-array>
+
+    <string-array name="doh_url">
+        <item />
+        <item>https://doh.pub/dns-query</item>
+        <item>https://dns.alidns.com/dns-query</item>
+        <item>https://doh.360.cn/dns-query</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/catvod/src/main/res/values/strings.xml b/catvod/src/main/res/values/strings.xml
index 67287fdbc..d12619864 100644
--- a/catvod/src/main/res/values/strings.xml
+++ b/catvod/src/main/res/values/strings.xml
@@ -1,5 +1,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="system">System</string>
+    <string-array name="doh_name">
+        <item>System</item>
+        <item>Tencent</item>
+        <item>Alibaba</item>
+        <item>360</item>
+    </string-array>
+
+    <string-array name="doh_url">
+        <item />
+        <item>https://doh.pub/dns-query</item>
+        <item>https://dns.alidns.com/dns-query</item>
+        <item>https://doh.360.cn/dns-query</item>
+    </string-array>
 
 </resources>
\ No newline at end of file