From 7048c10f1d3154072ab200923a464d1a99210395 Mon Sep 17 00:00:00 2001
From: djoeni <djoeni666@gmail.com>
Date: Mon, 20 Jun 2022 00:30:08 +0700
Subject: [PATCH] default dns setting from config

---
 .../src/main/golang/native/config/override.go |  2 +-
 .../main/res/drawable/ic_baseline_meta.xml    |  2 +-
 design/src/main/res/values-zh-rHK/strings.xml | 20 ++++++++++++++++++-
 design/src/main/res/values-zh-rTW/strings.xml | 20 ++++++++++++++++++-
 design/src/main/res/values-zh/strings.xml     | 20 ++++++++++++++++++-
 design/src/main/res/values/strings.xml        |  3 +--
 6 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/core/src/main/golang/native/config/override.go b/core/src/main/golang/native/config/override.go
index 3fc337c0..38a4570a 100644
--- a/core/src/main/golang/native/config/override.go
+++ b/core/src/main/golang/native/config/override.go
@@ -14,7 +14,7 @@ const (
 	OverrideSlotSession
 )
 
-const defaultPersistOverride = `{"dns":{"enable": false}, "redir-port": 0, "tproxy-port": 0}`
+const defaultPersistOverride = `{}`
 const defaultSessionOverride = `{}`
 
 var sessionOverride = defaultSessionOverride
diff --git a/design/src/main/res/drawable/ic_baseline_meta.xml b/design/src/main/res/drawable/ic_baseline_meta.xml
index 51125abc..6364da45 100644
--- a/design/src/main/res/drawable/ic_baseline_meta.xml
+++ b/design/src/main/res/drawable/ic_baseline_meta.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M 6.52 4.88 C 6.59 4.88 6.67 4.87 6.74 4.91 C 6.84 4.98 6.92 5.07 7.01 5.15 C 8.32 6.43 9.63 7.7 10.94 8.98 C 11.03 9.06 11.11 9.16 11.22 9.22 C 11.31 9.26 11.4 9.24 11.49 9.23 C 11.73 9.19 11.97 9.18 12.22 9.18 C 12.45 9.18 12.69 9.19 12.92 9.23 C 13.01 9.24 13.12 9.27 13.19 9.19 C 14.63 7.78 16.08 6.38 17.52 4.97 C 17.64 4.83 17.83 4.86 17.99 4.88 C 18.39 4.94 18.8 4.97 19.2 5.02 C 19.27 5.03 19.36 5.04 19.39 5.12 C 19.42 5.27 19.4 5.42 19.41 5.57 L 19.41 14.7 C 19.41 14.85 19.42 15.01 19.4 15.16 C 19.39 15.22 19.39 15.28 19.35 15.32 C 19.26 15.36 19.16 15.38 19.07 15.4 C 18.67 15.5 18.26 15.57 17.85 15.68 C 17.65 15.74 17.44 15.72 17.23 15.72 C 17.12 15.72 17.02 15.73 16.91 15.71 C 16.85 15.7 16.8 15.65 16.8 15.58 C 16.78 15.43 16.79 15.28 16.79 15.12 L 16.79 10.63 C 16.79 10.48 16.8 10.33 16.78 10.18 C 16.75 10.01 16.59 9.89 16.43 9.91 C 16.34 9.91 16.27 9.97 16.21 10.03 C 15.51 10.72 14.81 11.39 14.11 12.07 C 14.03 12.14 13.94 12.23 13.83 12.22 C 13.68 12.21 13.54 12.15 13.4 12.11 C 12.82 11.96 12.22 11.94 11.63 11.99 C 11.34 12.03 11.05 12.07 10.77 12.16 C 10.68 12.19 10.59 12.22 10.5 12.21 C 10.41 12.2 10.33 12.14 10.26 12.07 C 9.57 11.39 8.87 10.72 8.18 10.05 C 8.11 9.99 8.04 9.92 7.95 9.9 C 7.83 9.88 7.72 9.94 7.64 10.02 C 7.57 10.1 7.57 10.22 7.57 10.32 L 7.57 15.42 C 7.57 15.49 7.57 15.55 7.54 15.61 C 7.5 15.68 7.42 15.68 7.35 15.69 L 6.81 15.69 C 6.61 15.69 6.41 15.63 6.22 15.59 C 5.86 15.51 5.51 15.42 5.15 15.34 C 5.07 15.32 4.97 15.3 4.95 15.2 C 4.93 15.03 4.94 14.85 4.94 14.67 L 4.94 5.57 C 4.94 5.43 4.93 5.28 4.94 5.14 C 4.94 5.09 4.96 5.03 5.01 5 C 5.06 4.98 5.12 4.97 5.17 4.96 C 5.62 4.93 6.07 4.87 6.52 4.82 Z M 11.9 16.06 C 12.1 16.04 12.31 16.05 12.51 16.06 C 12.67 16.06 12.76 16.26 12.69 16.4 C 12.6 16.59 12.51 16.77 12.41 16.95 C 12.34 17.08 12.15 17.1 12.07 16.99 C 11.99 16.88 11.94 16.75 11.87 16.63 C 11.82 16.53 11.76 16.43 11.73 16.32 C 11.71 16.2 11.79 16.08 11.9 16.06 Z M 5.09 16.45 C 5.13 16.45 5.17 16.44 5.21 16.44 L 8.58 16.44 C 8.68 16.44 8.8 16.46 8.86 16.56 C 8.92 16.67 8.91 16.84 8.8 16.91 C 8.73 16.96 8.64 16.96 8.55 16.97 L 5.21 16.97 C 5.15 16.97 5.08 16.97 5.03 16.95 C 4.93 16.91 4.87 16.8 4.88 16.69 C 4.89 16.57 4.98 16.46 5.09 16.45 Z M 15.7 16.45 C 15.85 16.43 16 16.45 16.16 16.44 L 19.17 16.44 C 19.23 16.44 19.3 16.44 19.36 16.47 C 19.45 16.51 19.5 16.62 19.5 16.72 C 19.5 16.84 19.41 16.95 19.3 16.96 C 19.16 16.98 19.01 16.97 18.87 16.97 L 16.1 16.97 C 15.96 16.97 15.82 16.98 15.68 16.96 C 15.57 16.94 15.49 16.84 15.5 16.72 C 15.49 16.58 15.6 16.46 15.72 16.45 Z M 8.53 17.74 C 8.6 17.72 8.69 17.71 8.76 17.75 C 8.91 17.82 8.94 18.07 8.81 18.18 C 8.73 18.24 8.64 18.26 8.55 18.3 C 8.22 18.41 7.89 18.55 7.56 18.66 C 7.18 18.79 6.8 18.94 6.42 19.08 C 6.14 19.18 5.86 19.28 5.59 19.38 C 5.48 19.42 5.36 19.48 5.25 19.5 C 5.18 19.52 5.1 19.5 5.04 19.45 C 4.95 19.37 4.93 19.22 4.98 19.11 C 5.02 19.03 5.11 19 5.19 18.97 C 5.43 18.88 5.66 18.79 5.91 18.71 C 6.51 18.5 7.1 18.26 7.71 18.06 C 7.99 17.96 8.26 17.84 8.55 17.75 Z M 15.67 17.72 C 15.76 17.7 15.84 17.73 15.92 17.76 C 16.18 17.86 16.44 17.96 16.7 18.05 C 17.32 18.26 17.93 18.51 18.55 18.72 C 18.75 18.79 18.96 18.87 19.16 18.95 C 19.24 18.98 19.32 19.01 19.38 19.08 C 19.47 19.21 19.42 19.42 19.27 19.48 C 19.18 19.52 19.08 19.48 18.99 19.45 C 18.62 19.3 18.25 19.17 17.87 19.04 C 17.51 18.91 17.14 18.76 16.78 18.64 C 16.45 18.53 16.12 18.39 15.79 18.28 C 15.7 18.25 15.61 18.22 15.54 18.16 C 15.41 18.03 15.48 17.76 15.66 17.73 Z" />
+        android:pathData="M 4.44 2.19 C 4.54 2.18 4.65 2.18 4.74 2.24 C 4.88 2.33 4.99 2.46 5.11 2.57 C 6.9 4.32 8.7 6.06 10.49 7.81 C 10.61 7.93 10.72 8.06 10.87 8.13 C 10.99 8.19 11.12 8.16 11.24 8.14 C 11.57 8.08 11.9 8.08 12.23 8.08 C 12.55 8.08 12.87 8.1 13.19 8.15 C 13.32 8.17 13.47 8.21 13.56 8.09 C 15.53 6.16 17.51 4.24 19.49 2.32 C 19.66 2.13 19.91 2.18 20.13 2.2 C 20.68 2.29 21.24 2.33 21.79 2.4 C 21.88 2.42 22.01 2.43 22.04 2.54 C 22.08 2.74 22.06 2.95 22.06 3.16 L 22.06 15.65 C 22.06 15.86 22.07 16.07 22.05 16.28 C 22.04 16.36 22.03 16.44 21.97 16.5 C 21.85 16.56 21.71 16.58 21.58 16.61 C 21.03 16.75 20.47 16.85 19.92 17 C 19.64 17.08 19.36 17.05 19.08 17.05 C 18.94 17.05 18.79 17.06 18.64 17.04 C 18.56 17.03 18.5 16.95 18.49 16.87 C 18.46 16.66 18.48 16.45 18.47 16.24 L 18.47 10.09 C 18.47 9.89 18.48 9.68 18.45 9.48 C 18.42 9.25 18.19 9.08 17.97 9.11 C 17.85 9.11 17.75 9.19 17.66 9.27 C 16.71 10.21 15.74 11.13 14.79 12.06 C 14.68 12.16 14.56 12.28 14.4 12.26 C 14.2 12.24 14 12.16 13.81 12.12 C 13.02 11.91 12.19 11.88 11.38 11.96 C 10.99 12.02 10.59 12.07 10.21 12.2 C 10.09 12.24 9.96 12.28 9.84 12.27 C 9.71 12.26 9.61 12.17 9.52 12.08 C 8.58 11.15 7.62 10.24 6.68 9.31 C 6.59 9.22 6.49 9.13 6.36 9.11 C 6.2 9.09 6.04 9.16 5.93 9.28 C 5.84 9.39 5.83 9.55 5.83 9.69 L 5.83 16.67 C 5.83 16.76 5.83 16.85 5.79 16.94 C 5.74 17.04 5.62 17.04 5.53 17.05 L 4.8 17.05 C 4.52 17.05 4.26 16.97 3.99 16.91 C 3.5 16.8 3.01 16.68 2.52 16.57 C 2.42 16.54 2.27 16.51 2.25 16.37 C 2.22 16.13 2.24 15.89 2.24 15.65 L 2.24 3.21 C 2.24 3.01 2.23 2.82 2.25 2.63 C 2.26 2.56 2.28 2.48 2.34 2.44 C 2.41 2.41 2.49 2.4 2.56 2.39 C 3.18 2.34 3.79 2.26 4.41 2.2 Z M 11.79 17.48 C 12.07 17.45 12.35 17.46 12.62 17.48 C 12.83 17.48 12.97 17.76 12.87 17.95 C 12.75 18.21 12.62 18.46 12.48 18.71 C 12.39 18.89 12.13 18.92 12.01 18.76 C 11.9 18.61 11.83 18.43 11.74 18.27 C 11.67 18.13 11.58 18 11.55 17.84 C 11.52 17.68 11.63 17.51 11.79 17.48 Z M 2.47 18.02 C 2.52 18.01 2.58 18.01 2.63 18.01 L 7.25 18.01 C 7.39 18.01 7.54 18.04 7.63 18.18 C 7.71 18.33 7.7 18.56 7.55 18.66 C 7.45 18.73 7.32 18.73 7.21 18.74 L 2.64 18.74 C 2.55 18.74 2.47 18.74 2.39 18.71 C 2.26 18.66 2.17 18.5 2.19 18.35 C 2.2 18.19 2.32 18.04 2.48 18.02 Z M 17 18.02 C 17.21 18 17.42 18.02 17.62 18.01 L 21.73 18.01 C 21.82 18.01 21.91 18.01 21.99 18.05 C 22.11 18.11 22.18 18.25 22.18 18.39 C 22.18 18.55 22.06 18.71 21.9 18.72 C 21.7 18.74 21.51 18.73 21.31 18.73 L 17.52 18.73 C 17.33 18.73 17.13 18.75 16.94 18.71 C 16.8 18.68 16.68 18.54 16.69 18.38 C 16.67 18.19 16.82 18.03 16.99 18.01 Z M 7.18 19.78 C 7.28 19.75 7.39 19.73 7.49 19.79 C 7.69 19.89 7.74 20.23 7.56 20.38 C 7.45 20.46 7.32 20.49 7.2 20.54 C 6.74 20.69 6.3 20.88 5.84 21.03 C 5.32 21.21 4.8 21.42 4.28 21.6 C 3.9 21.73 3.52 21.87 3.14 22.01 C 2.98 22.07 2.83 22.14 2.67 22.18 C 2.57 22.2 2.46 22.18 2.38 22.11 C 2.25 22 2.23 21.79 2.3 21.64 C 2.36 21.53 2.48 21.49 2.58 21.45 C 2.91 21.33 3.23 21.2 3.56 21.09 C 4.38 20.81 5.19 20.47 6.02 20.2 C 6.4 20.07 6.78 19.9 7.16 19.78 Z M 16.95 19.76 C 17.07 19.73 17.18 19.78 17.3 19.81 C 17.66 19.94 18.01 20.09 18.37 20.21 C 19.22 20.5 20.05 20.84 20.9 21.13 C 21.18 21.23 21.46 21.34 21.74 21.44 C 21.85 21.48 21.96 21.52 22.04 21.61 C 22.16 21.79 22.09 22.08 21.89 22.16 C 21.76 22.21 21.63 22.16 21.51 22.12 C 21 21.92 20.49 21.74 19.98 21.56 C 19.48 21.38 18.99 21.18 18.48 21.01 C 18.02 20.86 17.58 20.67 17.13 20.52 C 17.01 20.47 16.88 20.44 16.78 20.35 C 16.61 20.17 16.7 19.8 16.94 19.75 Z" />
 </vector>
diff --git a/design/src/main/res/values-zh-rHK/strings.xml b/design/src/main/res/values-zh-rHK/strings.xml
index 0f179650..a24e5def 100644
--- a/design/src/main/res/values-zh-rHK/strings.xml
+++ b/design/src/main/res/values-zh-rHK/strings.xml
@@ -43,7 +43,7 @@
     <string name="import_from_url">從 URL 導入</string>
     <string name="interface_">界面</string>
     <string name="invalid_url">無效的 URL</string>
-    <string name="launch_name">Clash Meta for Android</string>
+    <string name="launch_name">Clash Meta</string>
     <string name="logcat">Logcat</string>
     <string name="logs">日誌</string>
     <string name="mode">模式</string>
@@ -211,4 +211,22 @@
     <string name="block_loopback">阻止本地迴環</string>
     <string name="block_loopback_summary">阻止本地迴環連接</string>
     <string name="clash_meta_for_android">Clash Meta for Android</string>
+    <string name="clash_meta_wiki">Clash Meta Wiki</string>
+    <string name="meta_features">Meta Features</string>
+    <string name="unified_delay">Unified Delay</string>
+    <string name="geodata_mode">Geodata Mode</string>
+    <string name="tcp_concurrent">TCP Concurrent</string>
+    <string name="enable_process">Enable Process</string>
+    <string name="sniffer_setting">Sniffer Setting</string>
+    <string name="sniffer">Sniffer</string>
+    <string name="sniffing">Sniffer Mode</string>
+    <string name="force_domain">Force Domain</string>
+    <string name="skip_domain">Skip Domain</string>
+    <string name="disable_sniffer">Disable Sniffer</string>
+    <string name="sniffer_config">Load Sniffer From Config</string>
+    <string name="sniffer_override">Override Sniffer Config</string>
+    <string name="geox_url_setting">GeoX Url Setting</string>
+    <string name="geox_geoip">GeoIp Url</string>
+    <string name="geox_mmdb">MMDB Url</string>
+    <string name="geox_geosite">Geosite Url</string>
 </resources>
\ No newline at end of file
diff --git a/design/src/main/res/values-zh-rTW/strings.xml b/design/src/main/res/values-zh-rTW/strings.xml
index cb893436..7f277472 100644
--- a/design/src/main/res/values-zh-rTW/strings.xml
+++ b/design/src/main/res/values-zh-rTW/strings.xml
@@ -43,7 +43,7 @@
     <string name="import_from_url">從 URL 匯入</string>
     <string name="interface_">介面</string>
     <string name="invalid_url">無效 URL</string>
-    <string name="launch_name">Clash Meta for Android</string>
+    <string name="launch_name">Clash Meta</string>
     <string name="logcat">Logcat</string>
     <string name="logs">日誌</string>
     <string name="mode">模式</string>
@@ -211,4 +211,22 @@
     <string name="block_loopback">攔截本地回送</string>
     <string name="block_loopback_summary">攔截本地回送連結</string>
     <string name="clash_meta_for_android">Clash Meta for Android</string>
+    <string name="clash_meta_wiki">Clash Meta Wiki</string>
+    <string name="meta_features">Meta Features</string>
+    <string name="unified_delay">Unified Delay</string>
+    <string name="geodata_mode">Geodata Mode</string>
+    <string name="tcp_concurrent">TCP Concurrent</string>
+    <string name="enable_process">Enable Process</string>
+    <string name="sniffer_setting">Sniffer Setting</string>
+    <string name="sniffer">Sniffer</string>
+    <string name="sniffing">Sniffer Mode</string>
+    <string name="force_domain">Force Domain</string>
+    <string name="skip_domain">Skip Domain</string>
+    <string name="disable_sniffer">Disable Sniffer</string>
+    <string name="sniffer_config">Load Sniffer From Config</string>
+    <string name="sniffer_override">Override Sniffer Config</string>
+    <string name="geox_url_setting">GeoX Url Setting</string>
+    <string name="geox_geoip">GeoIp Url</string>
+    <string name="geox_mmdb">MMDB Url</string>
+    <string name="geox_geosite">Geosite Url</string>
 </resources>
diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml
index 83dbe520..1dafb0b4 100644
--- a/design/src/main/res/values-zh/strings.xml
+++ b/design/src/main/res/values-zh/strings.xml
@@ -43,7 +43,7 @@
     <string name="import_from_url">从 URL 导入</string>
     <string name="interface_">界面</string>
     <string name="invalid_url">无效的 URL</string>
-    <string name="launch_name">Clash Meta for Android</string>
+    <string name="launch_name">Clash Meta</string>
     <string name="logcat">Logcat</string>
     <string name="logs">日志</string>
     <string name="mode">模式</string>
@@ -214,4 +214,22 @@
     <string name="geoip_fallback_code">GeoIP Fallback 区域代码</string>
     <string name="allow_bypass">允许应用绕过</string>
     <string name="allow_bypass_summary">允许其他应用绕过 VPN</string>
+    <string name="clash_meta_wiki">Clash Meta Wiki</string>
+    <string name="meta_features">Meta Features</string>
+    <string name="unified_delay">Unified Delay</string>
+    <string name="geodata_mode">Geodata Mode</string>
+    <string name="tcp_concurrent">TCP Concurrent</string>
+    <string name="enable_process">Enable Process</string>
+    <string name="sniffer_setting">Sniffer Setting</string>
+    <string name="sniffer">Sniffer</string>
+    <string name="sniffing">Sniffer Mode</string>
+    <string name="force_domain">Force Domain</string>
+    <string name="skip_domain">Skip Domain</string>
+    <string name="disable_sniffer">Disable Sniffer</string>
+    <string name="sniffer_config">Load Sniffer From Config</string>
+    <string name="sniffer_override">Override Sniffer Config</string>
+    <string name="geox_url_setting">GeoX Url Setting</string>
+    <string name="geox_geoip">GeoIp Url</string>
+    <string name="geox_mmdb">MMDB Url</string>
+    <string name="geox_geosite">Geosite Url</string>
 </resources>
\ No newline at end of file
diff --git a/design/src/main/res/values/strings.xml b/design/src/main/res/values/strings.xml
index a13c59aa..3bbffeb3 100644
--- a/design/src/main/res/values/strings.xml
+++ b/design/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
-    <string name="launch_name">Clash Meta for Android</string>
+    <string name="launch_name">Clash Meta</string>
     <string name="application_name">Clash Meta for Android</string>
 
     <string name="stopped">Stopped</string>
@@ -277,7 +277,6 @@
     <string name="clash_meta_wiki_url" translatable="false">https://docs.metacubex.one/</string>
 
     <string name="meta_features">Meta Features</string>
-    <string name="force_cert_verify">Force Cert Verify</string>
     <string name="unified_delay">Unified Delay</string>
     <string name="geodata_mode">Geodata Mode</string>
     <string name="tcp_concurrent">TCP Concurrent</string>