From 9f35064b58c3d90ab2bc78900348224c52b22baf Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Sat, 22 Apr 2017 13:28:29 +0800
Subject: [PATCH] Fixed DNS test failure

---
 README.md                                     | 24 ++++++++++---------
 .../daedalus/activity/ServerTestActivity.java |  9 ++++---
 app/src/main/res/values-zh/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           | 12 +++++-----
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 251f290..db973f0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Daedalus
+iTXTech Daedalus
 ==============
 
-__See the world outside through a CLEAN DNS server.__
+__See the world outside through a CLEAN DNS.__
 
 	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
@@ -18,21 +18,23 @@ __See the world outside through a CLEAN DNS server.__
 
 Introduction
 -------------
-This application can create a VPN tunnel to modify the DNS server on Android.<br>
+This application can create a VPN tunnel to modify the DNS settings on Android.<br>
 No root access required, no ads contained and functional under data connection.<br>
-Through the DNS server which are provided by third parties, users can visit Google, Twitter and so on via https directly without a VPN.<br>
+Through the DNS which are provided by third parties, users can visit Google, Twitter and so on via https directly without a VPN.<br>
+<br>
+__Users must comply with local laws and regulations.__<br>
 
-DNS server providers
+DNS providers
 -------------
-* __CuteDNS!__ - *Stopped service because of the police.*
-* __[Pure DNS](http://puredns.cn/)__
-* __[AIXYZ DNS](https://aixyz.com/)__ - *For academic purposes only.*
+* __CuteDNS!__ - *Stop service due to police intervention.*
+* __[Pure DNS](http://puredns.cn/)__ - *可能是迄今最不稳定的DNS。*
+* __[AIXYZ DNS](https://aixyz.com/)__ - __*For academic purposes only.*__
 
 Requirements
 -------------
-* Minimum Android version: 4.0.4 (API 15)
-* Recommended Android version: >= 5.0 (API 21)
-* Best Android version: >= 7.1 (API 25)
+* Minimum Android version: 4.0.4 (API 15) - __*Base VPN functions*__
+* Recommended Android version: >= 5.0 (API 21) - __*Full features*__
+* Best Android version: >= 7.1 (API 25) - __*Launcher shortcuts*__
 
 Get Daedalus
 -------------
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 bcf26e9..be48862 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
@@ -159,7 +159,7 @@ public class ServerTestActivity extends AppCompatActivity {
         stopThread();
         mHandler.removeCallbacks(mRunnable);
         mRunnable = null;
-        mHandler.obtainMessage(MSG_TEST_DONE).sendToTarget();
+        mHandler.shutdown();
         mHandler = null;
 
         System.gc();
@@ -185,6 +185,11 @@ public class ServerTestActivity extends AppCompatActivity {
             this.textViewTestInfo = textViewTestInfo;
         }
 
+        public void shutdown() {
+            startTestBtn = null;
+            textViewTestInfo = null;
+        }
+
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
 
@@ -196,8 +201,6 @@ public class ServerTestActivity extends AppCompatActivity {
                     startTestBtn.setVisibility(View.VISIBLE);
 
                     stopThread();
-                    startTestBtn = null;
-                    textViewTestInfo = null;
                     break;
             }
         }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a820b8c..9760287 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -16,7 +16,7 @@
     <string name="server_cutedns_north_china">CuteDNS! 华北</string>
     <string name="secondary_server">备用 DNS 服务器</string>
     <string name="notice_start_test">正在测试指定的 DNS 服务器……</string>
-    <string name="action_server_test">测试服务器</string>
+    <string name="action_server_test">DNS 测试</string>
     <string name="action_start_test">开始测试</string>
     <string name="test_domain">测试域名:</string>
     <string name="test_time_used">耗时:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64f38b6..e6235d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">Daedalus</string>
     <string name="action_settings">Settings</string>
-    <string name="notice_main">See the world outside through a CLEAN DNS server.</string>
+    <string name="notice_main">See the world outside through a CLEAN DNS.</string>
     <string name="button_text_activate">Activate</string>
     <string name="button_text_deactivate">Deactivate</string>
     <string name="action_about">About</string>
@@ -9,17 +9,17 @@
     <string name="settings_system">System settings</string>
     <string name="settings_boot">Auto activate on boot</string>
     <string name="settings_server">Server settings</string>
-    <string name="primary_server">Primary DNS server</string>
+    <string name="primary_server">Primary DNS</string>
     <string name="server_cutedns_south_china">CuteDNS! South China</string>
     <string name="server_cutedns_east_china">CuteDNS! East China</string>
     <string name="server_cutedns_north_china">CuteDNS! North China</string>
-    <string name="secondary_server">Secondary DNS server</string>
-    <string name="notice_start_test">Testing specified DNS server …</string>
-    <string name="action_server_test">Server test</string>
+    <string name="secondary_server">Secondary DNS</string>
+    <string name="notice_start_test">Testing specified DNS …</string>
+    <string name="action_server_test">DNS test</string>
     <string name="action_start_test">Start test</string>
     <string name="test_domain">Test domain:</string>
     <string name="test_time_used">Time used:</string>
-    <string name="test_dns_server">DNS server:</string>
+    <string name="test_dns_server">DNS:</string>
     <string name="test_result_resolved">Address:</string>
     <string name="test_failed">DNS query failed. Timeout or unknown hostname.</string>
     <string name="test_test_domain">google.com</string>