diff --git a/README.md b/README.md index 38f4c7e..e79363d 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ __Users must comply with local laws and regulations.__
DNS Server Providers ------------- * __CuteDNS__ - *Shutdown according to regulations* -* __[Pure DNS](https://puredns.cn/)__ - *Shutdown according to regulations* * __[FUN DNS](http://fundns.cn)__ - *Shutdown according to regulations* +* __[Pure DNS](https://puredns.cn/)__ * __[PdoMo-DNS](https://pdomo.me/)__ - *Intelligent Free Public DNS* Rule Providers @@ -83,9 +83,9 @@ Credits License ------------ -Copyright (C) 2017-2018 by iTXTech <[admin@itxtech.org](mailto:admin@itxtech.org)>
-Copyright (C) 2017-2018 by PeratX <[peratx@itxtech.org](mailto:peratx@itxtech.org)> + Copyright (C) 2017-2018 iTX Technologies + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -97,4 +97,4 @@ Copyright (C) 2017-2018 by PeratX <[peratx@itxtech.org](mailto:peratx@itxtech.or GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . \ No newline at end of file + along with this program. If not, see . diff --git a/app/src/main/assets/about_html/fundns.png b/app/src/main/assets/about_html/fundns.png deleted file mode 100644 index f797598..0000000 Binary files a/app/src/main/assets/about_html/fundns.png and /dev/null differ diff --git a/app/src/main/assets/about_html/ic_launcher.png b/app/src/main/assets/about_html/icon.png similarity index 100% rename from app/src/main/assets/about_html/ic_launcher.png rename to app/src/main/assets/about_html/icon.png diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index bfe8ed2..127330b 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -41,10 +41,10 @@
-
+
iTX Technologies

-
+
Daedalus
Version: Unknown
Build time: Unknown
@@ -56,11 +56,8 @@
Users must comply with local laws and regulations.

-
Copyright (C) 2017-2018 by iTXTech admin@itxtech.org +
Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org
-
Copyright (C) 2017-2018 by PeratX peratx@itxtech.org -
-

This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html index 28585a7..7f332df 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -41,10 +41,10 @@
-
+

-
+
Version: Unknown
Build time: Unknown
@@ -56,11 +56,8 @@
使用者必须遵守当地法律法规。

-
Copyright (C) 2017-2018 by iTXTech admin@itxtech.org +
Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org
-
Copyright (C) 2017-2018 by PeratX peratx@itxtech.org -
-

This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/assets/about_html/itxtech_logo.png b/app/src/main/assets/about_html/itxtech.png similarity index 100% rename from app/src/main/assets/about_html/itxtech_logo.png rename to app/src/main/assets/about_html/itxtech.png diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java index 44c9d3d..76be386 100644 --- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java +++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java @@ -48,6 +48,8 @@ public class Daedalus extends Application { public static final List DNS_SERVERS = new ArrayList() {{ 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("123.207.13.111", R.string.server_puredns_south_china)); + add(new DNSServer("123.207.137.88", R.string.server_puredns_north_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 40252b4..cfe084a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -85,6 +85,8 @@ PdoMo DNS 主服务器 PdoMo DNS 辅服务器 + PureDNS 华南 + PureDNS 华北 首选 DNS 服务器 备用 DNS 服务器 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 45c0d1b..2fd1665 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -85,6 +85,8 @@ PdoMo DNS 主伺服器 PdoMo DNS 輔伺服器 + PureDNS 華南 + PureDNS 華北 主要 DNS 伺服器 次要 DNS 伺服器 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9956207..f992c4f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,6 +90,8 @@ PdoMo DNS Primary PdoMo DNS Secondary + PureDNS South China + PureDNS North China Primary DNS server Secondary DNS server