From b46c9d21745f6364484352b2d728046dc8d02c7f Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sun, 4 Nov 2018 10:38:43 +0800 Subject: [PATCH] dns: add PureDNS. close #90 --- README.md | 8 ++++---- app/src/main/assets/about_html/fundns.png | Bin 23296 -> 0 bytes .../about_html/{ic_launcher.png => icon.png} | Bin app/src/main/assets/about_html/index.html | 9 +++------ app/src/main/assets/about_html/index_zh.html | 9 +++------ .../{itxtech_logo.png => itxtech.png} | Bin .../java/org/itxtech/daedalus/Daedalus.java | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 10 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 app/src/main/assets/about_html/fundns.png rename app/src/main/assets/about_html/{ic_launcher.png => icon.png} (100%) rename app/src/main/assets/about_html/{itxtech_logo.png => itxtech.png} (100%) 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 f797598b064c6a078ef1b9b248b9c9df94206b39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23296 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
-
+

-
+
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