From 478271a95be801195a8361251619404a0b485b4e Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Fri, 22 Jun 2018 20:54:39 +0800
Subject: [PATCH] Updated DNS Providers & README
---
README.md | 11 ++++++++---
app/src/main/assets/about_html/index.html | 6 ------
app/src/main/assets/about_html/index_zh.html | 6 ------
app/src/main/java/org/itxtech/daedalus/Daedalus.java | 3 ---
app/src/main/res/values-zh-rCN/strings.xml | 3 ---
app/src/main/res/values-zh-rTW/strings.xml | 3 ---
app/src/main/res/values/strings.xml | 3 ---
7 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index b607384..54cb0a3 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,19 @@ Through the DNS server and rules which are provided by third parties, users can
Features:
* No root access required, no ads contained
* Functional under data connection
-* DNS over TCP
* A tester for DNS servers
* IPv6 support (including Rules!)
* Custom DNS server
* Custom hosts and DNSMasq configuration
* EXTREME LOW power consume
* Material Design
+
+Supported DNS Query Methods:
+* UDP
+* TCP
+* DNS over TLS ([RFC7858](https://tools.ietf.org/html/rfc7858))
+* DNS over HTTPS ([IETF darft](https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-11))
+* DNS over HTTPS ([Google JSON](https://developers.google.com/speed/public-dns/docs/dns-over-https))
__Users must comply with local laws and regulations.__
@@ -47,8 +53,7 @@ DNS Server Providers
-------------
* __CuteDNS__ - *Shutdown according to regulations*
* __[Pure DNS](https://puredns.cn/)__ - *Shutdown according to regulations*
-* __[AIXYZ DNS](https://aixyz.com/)__ - __*For academic purposes only.*__
-* __[FUN DNS](http://fundns.cn)__ - *The Most Pure Domain Name Resolution Service*
+* __[FUN DNS](http://fundns.cn)__ - *Shutdown according to regulations*
* __[PdoMo-DNS](https://pdomo.me/)__ - *Intelligent Free Public DNS*
Rule Providers
diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html
index bf042c4..bfe8ed2 100644
--- a/app/src/main/assets/about_html/index.html
+++ b/app/src/main/assets/about_html/index.html
@@ -50,16 +50,10 @@
Build time: Unknown
Git commit: Unknown
-
-
-
-
-
-AIXYZ DNS is for academic purposes only!
Users must comply with local laws and regulations.
Copyright (C) 2017-2018 by iTXTech
admin@itxtech.org
diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html
index 74a3d12..28585a7 100644
--- a/app/src/main/assets/about_html/index_zh.html
+++ b/app/src/main/assets/about_html/index_zh.html
@@ -50,16 +50,10 @@
Build time: Unknown
Git commit: Unknown
-
-
-
-
-
-
AIXYZ DNS 仅限用于学术目的!
使用者必须遵守当地法律法规。
Copyright (C) 2017-2018 by iTXTech
admin@itxtech.org
diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
index b9ee8ce..44c9d3d 100644
--- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java
+++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
@@ -46,11 +46,8 @@ public class Daedalus extends Application {
private static final String SHORTCUT_ID_ACTIVATE = "shortcut_activate";
public static final List
DNS_SERVERS = new ArrayList() {{
- add(new DNSServer("119.23.248.241", R.string.server_fundns_south_china));
add(new DNSServer("101.132.183.99", R.string.server_pdomo_primary));
add(new DNSServer("193.112.15.186", R.string.server_pdomo_secondary));
- add(new DNSServer("115.159.146.99", R.string.server_aixyz_east_china));
- add(new DNSServer("123.206.21.48", R.string.server_aixyz_south_china));
}};
public static final List RULES = new ArrayList() {{
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3f1d12f..c86fce2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -81,9 +81,6 @@
服务器地址
服务器端口
- AIXYZ DNS 华南
- AIXYZ DNS 华东
- FUN DNS 华南
PdoMo DNS 主服务器
PdoMo DNS 辅服务器
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8b08bfb..f631118 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -81,9 +81,6 @@
伺服器網址
伺服器埠
- AIXYZ DNS 中國華南
- AIXYZ DNS 中國華東
- FUN DNS 中國華南
PdoMo DNS 主伺服器
PdoMo DNS 輔伺服器
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74fe542..3fb8597 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,9 +86,6 @@
Server Address
Server Port
- AIXYZ DNS South China
- AIXYZ DNS East China
- FUN DNS South China
PdoMo DNS Primary
PdoMo DNS Secondary