From 3de42b4659f61220c0310328b2ffd893ece28a4d Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Fri, 21 Apr 2017 18:47:23 +0800 Subject: [PATCH] Added AIXYZ DNS nodes --- README.md | 16 +++++++--- app/src/main/AndroidManifest.xml | 1 - app/src/main/assets/about_html/index.html | 29 ++++++++++++++++- app/src/main/assets/about_html/index_zh.html | 30 ++++++++++++++++-- .../java/org/itxtech/daedalus/Daedalus.java | 2 ++ .../daedalus/activity/AboutActivity.java | 12 +++++-- .../daedalus/activity/ServerTestActivity.java | 4 +-- .../daedalus/fragment/SettingsFragment.java | 2 +- app/src/main/res/menu/menu_about.xml | 4 +-- .../ic_settings_applications_black_36dp.png | Bin 0 -> 663 bytes .../ic_settings_applications_black_36dp.png | Bin 0 -> 490 bytes .../ic_settings_applications_black_36dp.png | Bin 0 -> 861 bytes .../ic_settings_applications_black_36dp.png | Bin 0 -> 1341 bytes .../ic_settings_applications_black_36dp.png | Bin 0 -> 1545 bytes app/src/main/res/values-zh/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 16 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/mipmap-hdpi/ic_settings_applications_black_36dp.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_settings_applications_black_36dp.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_settings_applications_black_36dp.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_settings_applications_black_36dp.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_settings_applications_black_36dp.png 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!


+
Pure DNS
+
+
AIXYZ DNS
+
+
+
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!
-

+
Pure DNS
+
+
AIXYZ DNS
+
+
+
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"/> - + app:showAsAction="never"!/--> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_settings_applications_black_36dp.png b/app/src/main/res/mipmap-hdpi/ic_settings_applications_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3517580473badc2ebc5d875ad86707766872a69f GIT binary patch literal 663 zcmV;I0%-k-P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Iw5L_t(o!|j;QOB+EH$3F(?wZ>4bt>CpLrXE6zK_NM7 zgxWu&PiXIIL)pUIlV&kXwVID2E+risRnFs+wZEcd*ZzV%;6=kQ61V zcqp#<$cUyG8x|>y89=!!r>qgJ%z0 z6|Wj!Y++rjoC)}uKpRG1C*C)l?Q;}*kRo=DzFfLhnDPf?d-V~d<2*S0l( zjuYuTyJ9L3z+i>Q`~1^f#wl0RK7U2?mwo;h@oJ+T>}4F-&%jDMtG#T-RTvwA?*gb9 z3YsuMs$CO%=*|kZ$-}OxU$cenM(m67lqm-S7;93WkrbD!6c@H(Toc1K?El#7s=9cNLuVs24r)A1IZwABn(Ikxjz-~06+FV$4 x+Q84>*U?17jQV|MkcoZhl8z2w-}?5i?HAlJ3^NyVZ{7d^002ovPDHLkV1hpzDPsTt literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_settings_applications_black_36dp.png b/app/src/main/res/mipmap-mdpi/ic_settings_applications_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9148354d4c99df4f7958d45c27cbcab14fbcc366 GIT binary patch literal 490 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Cl2L_t(Y$L*E7N&`_4hQF1VWD6S$jbLLTioS?NvT3#R z6|4-wjVq=Tf@^0ZSXc^a#T(>V)I<=L7=)mZW3!xG_L!YbEHl&nGkkDn=FGs%lGq#$ zE}qaU6tT>hIx3;pO(-WZMxk(`AlI09&r#?P#<&{=dB(&Y9nTx%o)omM<6Fr=Js$Z+ zp=dI%<5}KND7xIylYy>)B@Q{o9?Gye;ebWpS_1kc7dvq)bmBoJ(eRezK(Ay(pe)Vt zpe}nuY6hQxHa_VgeLrl+*kWG{^vc(&ueCIn(m7hwYM`}1Ya8-`?1S0{(54jRlQKN5 zrnMC3@u1OSr|}60sErhRm+pAbi?IDR@BcH9$MH4l2)@WFU(!#zOo{5qr(NKTGCANz zx<;PDxor)U*yaO;;)lj`i*0+l4cT9{1u3XvOnjyqdPBPWixZurd=z9&a3F8Zx7JE@ gvRw*h%*_6>U$LFcH)hpYng9R*07*qoM6N<$g3^i3Jpcdz literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_settings_applications_black_36dp.png b/app/src/main/res/mipmap-xhdpi/ic_settings_applications_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bc221c15dc2ea409bc69b767856aed21f4f33248 GIT binary patch literal 861 zcmV-j1ETziP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00PxXL_t(&-tCz`OjA)5#(z+-L}f5YLZ~koe_{%C(?ldeBeHcM594mYG)B1~JC@Qqr@@!z$xjnBrFnbCDa2 zv0+warh+B_XlH~M6tS7*Sj{<(@)Vm*o^WP+7bY|XeWuf~*d?RG@0{cM>~zG}qo7fh zR2bC~lyPwx)GnZmj-Vm6av9PPG_6{}(_RJrF!yzaUbNs%(3HAcf8b5fCkE@VJ4lel z!XiVwt|>iHR{Ra*&>F)vw;=Ce&l9P^zFf9p4WC1|2~~+szJi-$kH~H3p61o@oPz>0 zA#!5^vxir@cbP42T-MaOb3xz2eiQnRi%h9^)gM391egnwawsn{^M<268MIlt1!i32 zMg?XUGnz?#w@TSduK;hWlzoVC9YO1i)Zj+QmC5O?!9L5HS3yg4tm@WFQknty&*;$>fKGL!!ZR=!%MZ((d&yrlb0UYIY9&eM}+!OhIvXZ(o0)e>vPni z>!g-01004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00gy3L_t(|+U=ZgXq8nQ$3L5kHcRKdx>N}IV=bL;d>2k3B#3n{OJzS)bpB+B$q=^I%dn^~yN_*^x zUMZBkk6nyT+uv>q@P!rA$Y7yvmYv*Nu(f*hAgu$em+NQkkDBQs&t4V;ZYjyfmBRdE68YbCJC*r+=Q?&7vUUaB~8m5<}30{K|Rk0xTp zAsT%9sAtU4$0&8aeLTjnsUSGVR$qg-$_49Rw3M%(%2sk_qx&yBAD9+748rMGhi4BG z95x-@!&-irwk34ZI_?+RA7qWtzJgBHMUfh~l_!LD?|E#a#|$jLyHiZ&^b4&up7m=L zylVv;6H+jcfWXPlQqfn=iDU_pJY`f_JT8ONCbN>HL_2ca30ud?K{(^YkDt zv7d8#hN*agKI9{RcwFe=JJ0$_+Rf$_FVpJl++1o}et7nkrP9}k+GZ}K`khC8`>1n4 z%kq$KACEI)0_-HW1oD!i!(k9s2J&$yr*(t1&&t^Q(;D{D%M?@m!X6%x@GzHegMpO< zY~TQwB)ZkEe4=B5eXP#(#W>gt z++`x9O0&o)R)x$%5E-xqykQh7o>vPctJ%$X;q%|v z>~Wrd<{H()(2N5t_Y`cA9AL>aMm>vZ;go}|hi84Y@f>{)wZEs4`K%Ts$hCrbUEVwF zrHU=2qe;Kr5kiTGvQ!q#f?2RA!Ip(kB9>rFxIt)N6vAskk$^$9(E5PRrbXNQoU-@* z>~?)?c`l90{&R9*8Rdp6cvWsTd{PO95+QT=^%COiyeJi?SlY9{C z`?X6dD-A%B{@A|YeO_&`sAVFSSmPc`i7&JZF}z#VVT|Pj+g%^MnZHJO%g-S6`$r|E z)KEnt;y)@G<_sP3Q-+n5m6es1m6es%|62b5970MC`n*jL00000NkvXXu0mjfI_G~8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_settings_applications_black_36dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_settings_applications_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0980dd8160d4eeabc08bc8ae1c3108849d825013 GIT binary patch literal 1545 zcmV+k2KM=hP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00n_bL_t(|+U=c9Y*bYg$A42xi!{PYp|xdNSQs>@2@*_9 zkf36WxG<)nAE^ryVsv37V#`o91Y%rh{fHj{6vb%Mv;~7ELP=$XQA~&*3u0^$2&Jgi z)wD%hTE>l(+WES7-hDG?-aG%dEOYMRmwETSd+z_90hLOnQmIrbl}e>jsZ=VJN~Q8s z%h*mo7nvkcB-bRv^b@1je>ipYGF>!a=3diu6ZI2M3*$u#=jt^^vtM}HiXP6@>p6eE zJ&6EaP44HO@jw9@WvN?0J%PfLAVHVg2m5s308P7mo^1~to&*Wn+yUwjB%q`209_0u zpdojFCIbm*!W|%g68wjHO0$k#N+T0KWgr~TZsYOyg%i+I#^XN|PCy%s$A37SfR-7L ze@hqvO>&*__+>u5$%_UwXqCaa@BunvmBClx1N4qn27AH>=vk`_o(~_OjaC^v8a_ZP ztTMPgIDq0D=8VBZzT7H<1zgS=^E5{ol@90+YJdp$)0?&iFvhFgY@I_j9ck<0lXSD5 z2vEzPvH?9Y>r;z~C4HBs+09Kk=dpynNw18jY5QNqCnWQgYm_<3rkpo9LyRS9{=QBsAg3ECo^(JWpi9(< z0aVA|@&N4+Wzl(A8ldxBFA7iv!?FN1inDn=E(y?a)sZ7vWaV5pgNt$ z#p)E>l8T?+o-p2A@!Ob^S5Z8~BFnkQ%)M{xieJcQQftx!th9(~?%ua4=HA9HlDB=v zX)u1Un|prDUGeo5Ve z6sL?A8x2;6kMj=bXKuBK+HD-S(<16h2BiWzzztSWqlU|ZxMjU*5ueKgbUCNGO|#K| z!+v8RLc7rooHszfvo^=bTeHUAl4Ilz{3Qj@*Hn3k-IT$)8~3!W6y>A@KyNY6WAvqT zrMMxc==AJaE9Zkk1KQXT3FE*Nwx>D)7c(qj*5gg$4Ah<(Z3o zt32bmk-SXOG0}ixg@1~TQYjWsWtP)Fd3q1pFBZ^#DJIUSs#TD zP@h!>$F)shX8jh%Mw6w+<5z^URq1l$@$U#HAoFIokA)M^)5hbsg%i+T*UjVzsZ=VJN~Kb%R4SE9rBbO>s+9T{qHoD8F4Bt;00000NkvXXu0mjfzhBTx literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index dc49426..349f52c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -46,4 +46,6 @@ 支持和帮助 Pure DNS 华北 Pure DNS 华东 + AIXYZ DNS 华南 + AIXYZ DNS 华东 \ 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 5f4f444..8da8f71 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,4 +46,6 @@ Help & Support Pure DNS North China Pure DNS East China + AIXYZ DNS South China + AIXYZ DNS East China