diff --git a/README.md b/README.md index 9f0c5d3..8ab34b9 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ DNS Server Providers * __[FUN DNS](http://fundns.cn)__ - *Shutdown according to regulations* * __[Pure DNS](https://puredns.cn/)__ * __[PdoMo-DNS](https://pdomo.me/)__ - *Intelligent Free Public DNS* +* __[rubyfish](https://www.rubyfish.cn)__ - *Free DoT/DoH DNS* Rule Providers ------------- diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index 127330b..9eb9401 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -50,10 +50,6 @@
Build time: Unknown
Git commit: Unknown

-
-
PdoMo DNS
-
-
Users must comply with local laws and regulations.

Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org @@ -91,4 +87,4 @@ href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3
- \ No newline at end of file + diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html index 7f332df..8fdda6b 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -50,10 +50,6 @@
Build time: Unknown
Git commit: Unknown

-
-
PdoMo DNS
-
-
使用者必须遵守当地法律法规。

Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org @@ -91,4 +87,4 @@ href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3
- \ No newline at end of file + diff --git a/app/src/main/assets/about_html/pdomo.jpg b/app/src/main/assets/about_html/pdomo.jpg deleted file mode 100644 index 8219ae2..0000000 Binary files a/app/src/main/assets/about_html/pdomo.jpg and /dev/null differ diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java index 76be386..9268cee 100644 --- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java +++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java @@ -50,10 +50,13 @@ public class Daedalus extends Application { add(new DNSServer("193.112.15.186", R.string.server_pdomo_secondary)); add(new DNSServer("123.207.13.111", R.string.server_puredns_south_china)); add(new DNSServer("123.207.137.88", R.string.server_puredns_north_china)); + add(new DNSServer("dns.rubyfish.cn/dns-query", R.string.server_rubyfish)); }}; public static final List RULES = new ArrayList() {{ //Build-in Hosts rule providers + add(new Rule("iTXTech/Daedalus/Default", "daedalus-default.hosts", Rule.TYPE_HOSTS, + "https://raw.githubusercontent.com/iTXTech/Daedalus/master/default.hosts", false)); add(new Rule("googlehosts/hosts", "googlehosts.hosts", Rule.TYPE_HOSTS, "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts", false)); add(new Rule("vokins/yhosts", "vokins.hosts", Rule.TYPE_HOSTS, diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cfe084a..2a7507e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -87,6 +87,7 @@ PdoMo DNS 辅服务器 PureDNS 华南 PureDNS 华北 + 红鱼 (DoT/DOH) 首选 DNS 服务器 备用 DNS 服务器 @@ -99,4 +100,4 @@ google.com 版本: - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2fd1665..1a3de53 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -87,6 +87,7 @@ PdoMo DNS 輔伺服器 PureDNS 華南 PureDNS 華北 + 紅魚 (DoT/DOH) 主要 DNS 伺服器 次要 DNS 伺服器 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d469579..7368e97 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,6 +92,7 @@ PdoMo DNS Secondary PureDNS South China PureDNS North China + rubyfish (DoT/DOH) Primary DNS server Secondary DNS server diff --git a/default.host b/default.host new file mode 100644 index 0000000..d6470fe --- /dev/null +++ b/default.host @@ -0,0 +1,5 @@ +# rubyfish +# Ease Asia +115.159.154.226 dns.rubyfish.cn +# West USA +# 47.99.165.31 dns.rubyfish.cn