diff --git a/README.md b/README.md
index 3d7956b..c31570f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Daedalus
==============
-__See the world outside through [CuteDNS!](https://www.cutedns.cn).__
+__See the world outside through a CLEAN DNS server.__
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
@@ -20,24 +20,30 @@ Introduction
-------------
This application can create a VPN tunnel to modify the DNS server on Android.
No root access required, no ads contained and functional under data connection.
-Through the DNS server provided by [CuteDNS!](https://www.cutedns.cn), users can visit Google, Twitter and so on via https directly without a VPN.
+Through the DNS server provided by third parties, users can visit Google, Twitter and so on via https directly without a VPN.
-----------------
~~本萌新第一个 Android 应用。~~
不需要翻墙就能在 Android 上通过 https 协议直连 Google, Twitter, Facebook 等网站。
-通过 CuteDNS 的 DNS 服务器，减少 DNS 劫持 ~~（当然万能的 *** 想封了你也不是不行）~~ 。
+通过 disfigured 的 DNS 服务器，减少 DNS 劫持 ~~（当然万能的 *** 想封了你也不是不行）~~ 。
基于 Android 提供的 VpnService 实现，不需要 root，数据连接也可用。
支持开机启动。 ~~BAT流氓软件~~
~~好吧故事编不下去了。~~
__各位 dalao 见笑了！__
+DNS server providers
+-------------
+* __CuteDNS!__
+* __[Pure DNS](http://puredns.cn/)__
+* __[AIXYZ DNS](https://aixyz.com/)__
+
Requirements
-------------
* Min Android version: 4.0.3 (API 15)
-* Recommend Android version: >= 5.0 (API 21)
-* Best Android version: >=7.1 (API 25)
+* Recommended Android version: >= 5.0 (API 21)
+* Best Android version: >= 7.1 (API 25)
Get Daedalus
-------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f3a23cb..009dce3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,6 @@
diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html
index 3efc2be..f3b1278 100644
--- a/app/src/main/assets/about_html/index.html
+++ b/app/src/main/assets/about_html/index.html
@@ -7,6 +7,27 @@
body {
text-align: center;
}
+
+ a:link {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:visited {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:hover {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:active {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
@@ -29,12 +50,18 @@
null
-CuteDNS!
+
+
+
+
+
+AIXYZ DNS is for academic use only!
Users must comply with local laws and regulations.
Welcome to CuteDNS! QQ Group: 625385297.
+ Welcome to AIXYZ DNS QQ Group: 337513594.
Open the menu to explore more features.
diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html
index 6bc3c75..6b6576d 100644
--- a/app/src/main/assets/about_html/index_zh.html
+++ b/app/src/main/assets/about_html/index_zh.html
@@ -7,6 +7,27 @@
body {
text-align: center;
}
+
+ a:link {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:visited {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:hover {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
+ a:active {
+ color: #FF4081;
+ text-decoration: none;
+ }
+
@@ -29,13 +50,18 @@
null
-CuteDNS!
-
+
+
+
+
+
+AIXYZ DNS 仅限用于学术用途！
使用者必须遵守当地法律法规。
欢迎加入 CuteDNS! QQ群：625385297 。
+ 欢迎加入 AIXYZ DNS QQ群：337513594 。
打开菜单探索更多功能。
diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
index 2d273df..a395e49 100644
--- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java
+++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
@@ -38,6 +38,8 @@ public class Daedalus extends Application {
add(new DnsServer("2", "123.206.61.167", R.string.server_cutedns_south_china));
add(new DnsServer("3", "115.159.220.214", R.string.server_puredns_east_china));
add(new DnsServer("4", "123.207.137.88", R.string.server_puredns_north_china));
+ add(new DnsServer("5", "115.159.146.99", R.string.server_aixyz_east_china));
+ add(new DnsServer("6", "123.206.21.48", R.string.server_aixyz_south_china));
}};
public static final String[] DEFAULT_TEST_DOMAINS = new String[]{
diff --git a/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java
index 5816962..369a161 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java
@@ -58,6 +58,12 @@ public class AboutActivity extends AppCompatActivity {
}
mWebView.setWebViewClient(new WebViewClient() {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {//for better compatibility
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+ return true;
+ }
+
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
@@ -86,7 +92,7 @@ public class AboutActivity extends AppCompatActivity {
mWebView = null;
}
- System.exit(0);
+ //System.exit(0);
}
@Override
@@ -116,9 +122,9 @@ public class AboutActivity extends AppCompatActivity {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.cutedns.cn")));
}
- if (id == R.id.action_join_qqgroup) {
+ /*if (id == R.id.action_join_qqgroup) {
joinQQGroup("q6Lfo_EhAEO1fP6Xg3fmKsP4pd6U5-RE");
- }
+ }*/
return super.onOptionsItemSelected(item);
}
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 da7b2ed..e9674a8 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
@@ -55,6 +55,7 @@ public class ServerTestActivity extends AppCompatActivity {
final Spinner spinnerServerChoice = (Spinner) findViewById(R.id.spinner_server_choice);
ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, DnsServer.getDnsServerNames(this));
spinnerServerChoice.setAdapter(spinnerArrayAdapter);
+ spinnerServerChoice.setSelection(Integer.valueOf(Daedalus.getPrefs().getString("primary_server", "0")));
final AutoCompleteTextView textViewTestUrl = (AutoCompleteTextView) findViewById(R.id.autoCompleteTextView_test_url);
ArrayAdapter autoCompleteArrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, Daedalus.DEFAULT_TEST_DOMAINS);
@@ -106,8 +107,7 @@ public class ServerTestActivity extends AppCompatActivity {
private StringBuilder testServer(DNSClient client, String dnsServer, String testUrl, StringBuilder testText) {
Log.d(TAG, "Testing DNS " + dnsServer);
- testText.append(getResources().getString(R.string.test_domain)).append(" ").append(testUrl).append("\n"
- ).append(getResources().getString(R.string.test_dns_server)).append(" ").append(dnsServer);
+ testText.append(getResources().getString(R.string.test_domain)).append(" ").append(testUrl).append("\n").append(getResources().getString(R.string.test_dns_server)).append(" ").append(dnsServer);
mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
diff --git a/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java b/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java
index 9a8add3..bd95063 100644
--- a/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java
@@ -45,7 +45,7 @@ public class SettingsFragment extends PreferenceFragment {
ListPreference secondaryServer = (ListPreference) findPreference("secondary_server");
secondaryServer.setEntries(DnsServer.getDnsServerNames(Daedalus.getInstance()));
secondaryServer.setEntryValues(DnsServer.getDnsServerIds());
- secondaryServer.setSummary(DnsServer.getDnsServerById(primaryServer.getValue()).getStringDescription(Daedalus.getInstance()));
+ secondaryServer.setSummary(DnsServer.getDnsServerById(secondaryServer.getValue()).getStringDescription(Daedalus.getInstance()));
secondaryServer.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/app/src/main/res/menu/menu_about.xml b/app/src/main/res/menu/menu_about.xml
index a56eb46..2f8de9f 100644
--- a/app/src/main/res/menu/menu_about.xml
+++ b/app/src/main/res/menu/menu_about.xml
@@ -14,8 +14,8 @@
android:title="@string/action_visit_cutedns"
android:orderInCategory="100"
app:showAsAction="never"/>
-