n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added AIXYZ DNS nodes

Browse Source
This commit is contained in:
PeratX 2017-04-21 18:47:23 +08:00
parent c609e8a760
commit 3de42b4659
16 changed files with 87 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -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.<br>
No root access required, no ads contained and functional under data connection.<br>
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.<br>
Through the DNS server provided by third parties, users can visit Google, Twitter and so on via https directly without a VPN.<br>
-----------------
~~本萌新第一个 Android 应用。~~<br>
不需要翻墙就能在 Android 上通过 https 协议直连 Google, Twitter, Facebook 等网站。<br>
通过 CuteDNS 的 DNS 服务器，减少 DNS 劫持 ~~（当然万能的 *** 想封了你也不是不行）~~ 。<br>
通过 disfigured 的 DNS 服务器，减少 DNS 劫持 ~~（当然万能的 *** 想封了你也不是不行）~~ 。<br>
基于 Android 提供的 VpnService 实现，不需要 root，数据连接也可用。<br>
支持开机启动。 ~~BAT流氓软件~~ <br>
~~好吧故事编不下去了。~~ <br>
<br>
__各位 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
-------------

1
app/src/main/AndroidManifest.xml
View File

@ -60,7 +60,6 @@
</activity>
<activity
android:name=".activity.AboutActivity"
android:process=":remote"
android:launchMode="singleTask"
android:label="@string/action_about">
</activity>

29
app/src/main/assets/about_html/index.html
View File

@ -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;
}
</style>
</head>
@ -29,12 +50,18 @@
<div id="git_commit" style="font-size: 10px;">null</div>
<br>
<img width="185" height="55" src="cutedns_logo.png">
<div style="font-size: 25px;">CuteDNS!</div>
<br>
<br>
<div style="font-size: 25px;"><a href="http://puredns.cn">Pure DNS</a></div>
<br>
<div style="font-size: 25px;"><a href="https://aixyz.com">AIXYZ DNS</a></div>
<br>
<br>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic use only!</div>
<div style="font-size: 12px; color: gray;">
Users must comply with local laws and regulations.<br>
Welcome to CuteDNS! QQ Group: 625385297.<br>
Welcome to AIXYZ DNS QQ Group: 337513594.<br>
Open the menu to explore more features.
</div>
<br>

30
app/src/main/assets/about_html/index_zh.html
View File

@ -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;
}
</style>
</head>
@ -29,13 +50,18 @@
<div id="git_commit" style="font-size: 10px;">null</div>
<br>
<img width="185" height="55" src="cutedns_logo.png">
<div style="font-size: 25px;">CuteDNS!</div>
<br>
<br>
<div style="font-size: 25px;"><a href="http://puredns.cn">Pure DNS</a></div>
<br>
<div style="font-size: 25px;"><a href="https://aixyz.com">AIXYZ DNS</a></div>
<br>
<br>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS 仅限用于学术用途！</div>
<div style="font-size: 12px; color: gray;">
使用者必须遵守当地法律法规。<br>
欢迎加入 CuteDNS! QQ群：625385297 。<br>
欢迎加入 AIXYZ DNS QQ群：337513594 。<br>
打开菜单探索更多功能。
</div>
<br>

2
app/src/main/java/org/itxtech/daedalus/Daedalus.java
View File

@ -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[]{

12
app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java
View File

@ -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);
}

4
app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
View File

@ -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();

2
app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java
View File

@ -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) {

4
app/src/main/res/menu/menu_about.xml
View File

@ -14,8 +14,8 @@
android:title="@string/action_visit_cutedns"
android:orderInCategory="100"
app:showAsAction="never"/>
<item android:id="@+id/action_join_qqgroup"
<!--item android:id="@+id/action_join_qqgroup"
android:title="@string/action_join_qqgroup"
android:orderInCategory="100"
app:showAsAction="never"/>
app:showAsAction="never"!/-->
</menu>

BIN
app/src/main/res/mipmap-hdpi/ic_settings_applications_black_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
app/src/main/res/mipmap-mdpi/ic_settings_applications_black_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 490 B

BIN
app/src/main/res/mipmap-xhdpi/ic_settings_applications_black_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 861 B

BIN
app/src/main/res/mipmap-xxhdpi/ic_settings_applications_black_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_settings_applications_black_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
app/src/main/res/values-zh/strings.xml
View File

@ -46,4 +46,6 @@
<string name="settings_help_and_support">支持和帮助</string>
<string name="server_puredns_north_china">Pure DNS 华北</string>
<string name="server_puredns_east_china">Pure DNS 华东</string>
<string name="server_aixyz_south_china">AIXYZ DNS 华南</string>
<string name="server_aixyz_east_china">AIXYZ DNS 华东</string>
</resources>

2
app/src/main/res/values/strings.xml
View File

@ -46,4 +46,6 @@
<string name="settings_help_and_support">Help &amp; Support</string>
<string name="server_puredns_north_china">Pure DNS North China</string>
<string name="server_puredns_east_china">Pure DNS East China</string>
<string name="server_aixyz_south_china">AIXYZ DNS South China</string>
<string name="server_aixyz_east_china">AIXYZ DNS East China</string>
</resources>