From ec3dd38e3d5f7e0f917b2b8e4b4a4fd90912e071 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Sat, 22 Apr 2017 16:33:15 +0800
Subject: [PATCH] Added LUG@USTC(https://lug.ustc.edu.cn) Neat DNS nodes

---
 app/src/main/assets/about_html/index.html                     | 1 +
 app/src/main/assets/about_html/index_zh.html                  | 2 ++
 app/src/main/java/org/itxtech/daedalus/Daedalus.java          | 4 ++++
 .../org/itxtech/daedalus/activity/ServerTestActivity.java     | 3 +--
 app/src/main/res/values-zh/strings.xml                        | 4 ++++
 app/src/main/res/values/strings.xml                           | 4 ++++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html
index 29700f8..0f4e179 100644
--- a/app/src/main/assets/about_html/index.html
+++ b/app/src/main/assets/about_html/index.html
@@ -56,6 +56,7 @@
 <br>
 <div style="font-size: 25px;"><a href="https://aixyz.com">AIXYZ DNS</a></div>
 <br>
+<div style="font-size: 25px;"><a href="https://groups.google.com/forum/#!forum/neat-dns">Neat DNS</a></div>
 <br>
 <div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic use only!</div>
 <div style="font-size: 12px; color: gray;">
diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html
index f134fb2..087b690 100644
--- a/app/src/main/assets/about_html/index_zh.html
+++ b/app/src/main/assets/about_html/index_zh.html
@@ -56,6 +56,8 @@
 <br>
 <div style="font-size: 25px;"><a href="https://aixyz.com">AIXYZ DNS</a></div>
 <br>
+<div style="font-size: 25px;"><a href="https://groups.google.com/forum/#!forum/neat-dns">Neat DNS</a></div>
+<br>
 <br>
 <div style="font-size: 12px; color: #FF4081">AIXYZ DNS 仅限用于学术目的！</div>
 <div style="font-size: 12px; color: gray;">
diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
index 30cd760..adf5568 100644
--- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java
+++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
@@ -40,6 +40,10 @@ public class Daedalus extends Application {
         add(new DnsServer("1", "123.207.137.88", R.string.server_puredns_north_china));
         add(new DnsServer("2", "115.159.146.99", R.string.server_aixyz_east_china));
         add(new DnsServer("3", "123.206.21.48", R.string.server_aixyz_south_china));
+        add(new DnsServer("4", "202.141.178.13", R.string.server_neat_dns_cmcc));
+        add(new DnsServer("5", "202.141.162.123", R.string.server_neat_dns_china_telecom));
+        add(new DnsServer("6", "202.38.93.153", R.string.server_neat_dns_education_network));
+        add(new DnsServer("7", "202.38.93.94", R.string.server_neat_dns_education_network_alternative));
     }};
 
     public static final String[] DEFAULT_TEST_DOMAINS = new String[]{
diff --git a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
index be48862..237b6b1 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
@@ -185,7 +185,7 @@ public class ServerTestActivity extends AppCompatActivity {
             this.textViewTestInfo = textViewTestInfo;
         }
 
-        public void shutdown() {
+        void shutdown() {
             startTestBtn = null;
             textViewTestInfo = null;
         }
@@ -199,7 +199,6 @@ public class ServerTestActivity extends AppCompatActivity {
                     break;
                 case MSG_TEST_DONE:
                     startTestBtn.setVisibility(View.VISIBLE);
-
                     stopThread();
                     break;
             }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 918a53a..2f4f0d2 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -49,4 +49,8 @@
     <string name="server_aixyz_south_china">AIXYZ DNS 华南</string>
     <string name="server_aixyz_east_china">AIXYZ DNS 华东</string>
     <string name="action_license">开源许可证</string>
+    <string name="server_neat_dns_education_network">Neat DNS 教育网</string>
+    <string name="server_neat_dns_education_network_alternative">Neat DNS 教育网备选</string>
+    <string name="server_neat_dns_cmcc">Neat DNS 中国移动</string>
+    <string name="server_neat_dns_china_telecom">Neat DNS 中国电信</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab4c610..af8c09c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,4 +49,8 @@
     <string name="server_aixyz_south_china">AIXYZ DNS South China</string>
     <string name="server_aixyz_east_china">AIXYZ DNS East China</string>
     <string name="action_license">Open Source License</string>
+    <string name="server_neat_dns_education_network">Neat DNS Education Network</string>
+    <string name="server_neat_dns_education_network_alternative">Neat DNS Education Network Alternative</string>
+    <string name="server_neat_dns_cmcc">Neat DNS CMCC</string>
+    <string name="server_neat_dns_china_telecom">Neat DNS China Telecom</string>
 </resources>