From 99b38b2b3cee640f1e1551b86194baee996307f3 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sat, 10 Nov 2018 13:00:25 +0800 Subject: [PATCH] dns: add rubyfish. close #91 --- README.md | 1 + app/src/main/assets/about_html/index.html | 6 +----- app/src/main/assets/about_html/index_zh.html | 6 +----- app/src/main/assets/about_html/pdomo.jpg | Bin 13156 -> 0 bytes .../java/org/itxtech/daedalus/Daedalus.java | 3 +++ app/src/main/res/values-zh-rCN/strings.xml | 3 ++- app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + default.host | 5 +++++ 9 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 app/src/main/assets/about_html/pdomo.jpg create mode 100644 default.host diff --git a/README.md b/README.md index 9f0c5d3..8ab34b9 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ DNS Server Providers * __[FUN DNS](http://fundns.cn)__ - *Shutdown according to regulations* * __[Pure DNS](https://puredns.cn/)__ * __[PdoMo-DNS](https://pdomo.me/)__ - *Intelligent Free Public DNS* +* __[rubyfish](https://www.rubyfish.cn)__ - *Free DoT/DoH DNS* Rule Providers ------------- diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index 127330b..9eb9401 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -50,10 +50,6 @@
Build time: Unknown
Git commit: Unknown

-
-
PdoMo DNS
-
-
Users must comply with local laws and regulations.

Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org @@ -91,4 +87,4 @@ href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3
- \ No newline at end of file + diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html index 7f332df..8fdda6b 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -50,10 +50,6 @@
Build time: Unknown
Git commit: Unknown

-
-
PdoMo DNS
-
-
使用者必须遵守当地法律法规。

Copyright (C) 2017-2018 iTX Technologies admin@itxtech.org @@ -91,4 +87,4 @@ href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3
- \ No newline at end of file + diff --git a/app/src/main/assets/about_html/pdomo.jpg b/app/src/main/assets/about_html/pdomo.jpg deleted file mode 100644 index 8219ae25466629656623324f18b2fa3ecec3b7a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13156 zcmb_i2|QG7)W7!ZsgWgHB!hS>WZ%+QMz*m}sE}o}*)tLnGFh@EOJW%N3_@8`ByF~_ z6{(QyQns>wcTh>&`+nayevdnI?{m*R=l?(FJkNcev+`o)EwB}?uB8r;k&yxC!9QT7 z8&CtbP*c-TQ*EK4p`oSSLdO7MWT2;K;MlgE8N$uU%frpd#l^QwShkS+k^51Q@dM;6 zWE3o9D-Qu)03f3RwIwOM{vji$proRv*+NT44|XWo3XqdgP>@qnP*G7*g1vpf>i{JS z)wW&xRjIcdoS@-%h8*yZOx+@IsPF+RqGfWogtf~hTDl!<>>QkedxW6EB9c-ErDbI0 z)DFYcH8i#0hDOFFre@|y8{3n1_709HS2uSL&+}gBfXjhF!B;{sQPDB6*W+%)Ct%ak zaT%Fe**Uk1ic9X?EiEgrseM@YsQ&Sjr^ME__KwaMFS~mC`ri$_9~>GU`S@vSdS-U+ z^Ot#&U1R{onpxj0+hi9DXcsvpB?To7$u2T-Pq0z2P*UyMPrXgmfaZkrcK!qYTOfxb zQwtx^3P>O(S*=}K=yvRu>=pb-GHunee`naG|CMFm4Et_Z7r;P429ig?0w@EmSd3`p zf(jM`1%BP&01^t(C+CD>{pkKpGtkmjp@JYdDa9Ryg&lq)6uQ*_1_Ay{D>i^pQ9%qq z(VLrHl-~{v{CDdA>O2yFVlkAE7|vf^Ts`+6)e|HqLBkD$=$rjyle$9+C5SAUjvz#z z4D9hQS}~ySfc2;SLubBUbM-rWKn~&16je|lMHUuAznRBv801?i2g-BJ(`6Z}`+x8|X6Qt+mgK!W_~wf-EcTmDYRce>zfDa3zs z7&C!P?Une;lYU4T`ohj6_ft(#{li`VNjE4qij?Ah(v74mJ!ZcO){lWmG*CUU&OgZq z{@lb!DURBo+VRhM^Oq0Y4A9zd#J4AI$^b|JZt>msr~-e=lHZ-`yJSQ&Nq@eEKlsI_ z$NVnAd_52U7Q#OzhT=61zPfbt-@OJ5Vh}h|*s1;j>i?kOs&>E75Dq01UVp+yX_CKB zSm0QQgd-^-`i_52>>I@ae@I4OuaSYMQ2qp+fl3NF7}=yOvN^f~RDLHl1<^+mrKLjm z2lx9AuD3=X?JsazRUWq?eQz>=+W(jIiLde+1d{ywIO6-Ab-z9@p+eH{S2vM4YiWNQ ztu}!OCSg$AX14t;px8K`HmVwoGM!$HA47|}V%8#*`G$c;uhwUM@)lB3)Ji~7ox?`d zMAY~PLN2a8S(%O+V({6Z4kYVy3+y2Xg**kx*Huc^ya@-+23BtX#bdy(t4i$zK&cu^ zF{Fc5G--~bejjX#L*O9A8@LZm1qyc^)-)w$CsJtB!-OQUeygW1Lg;$IJ{2C(|!pN^R5Z^9o~ao_giYsZ3!NyaH@Vx_Bw#GYr&TseSuW+Tp3D`^!c)FFI3K zfEpp*l(c0QnI$Tomo&3sJoU*oFIobItu8IIhB5(p-Q$2-i?>HwR~&=8aD_m`JVs=u zC-us$nEqj-D*{<~f!&RzPqa@!(=w4zo(C`pS#o?1r)5njFTBhNMP!K~TxwF?4!|*S zr=JU5$<%pS6!TyLT3<-`qOdnufi8NPMRSQtqeOGiD{yy{fG(EXf77e>SH%q1CQZM5jR!@CtE}wZn3VpYI&Dth>SvbL4nm zjuZsM)yCA$7#o*-8F5j{W8}0GX=EfN5OUJYR*W>a_&%E#Bd0SSxfs)`YlSV&_#nlH zzGp+2%zuOYKy}WFb>Z0zVbYCo%KjsBeEkZ*aTT_Uj|r6?H>v)@p1cfE_9z<7KftQ7 zfaqT6pTcqC3VAPFbQ`OGB3}2ZmEm}J3Hh-@gF&n^=i1CMM40GJC0V177FLCsl-J&x zrm{qub%kLo&ph-??%WWWb(-aG11idL)9PW^hXTFDvryM89KcA_*wL}_{d#ZJC%hT6V%nSwZdlk zqK^848uey%Cx#k=p-ZBn z?R%dy`-!&i4zZ=-FY~e2WqRn}6)3#}U8-PMEh@8Z%ZRW@&$N|Mit!P*z6$I_v|{lD z0g5=!?QKGcv$nrRjSSEYXt=@PNf^{_y}l2RarKaKE{(9CNIm6dc8ww2`RKlv>1vpG z0b}xHO@gdWRRp=apiq{-%CL4T{_x!X)CW@ZsDu5v%#Ep*w^pP+{rl6YG15rQa`#Ne_<^o_$tTXnINyTT zpF9b$Sl!GTZh6ce+i)%c7mqm`!(~@4+YmGjoxm6j~reIKD6yo6X1?n{f95F)0}E<&us`owun)+qFpWl)g=Ltvpr(gv?{dlC+)m+EycZCLxqL<4{&c8c_ z8O9-o<|a#GHAf634I+@DHiWLLS}+JLia;9HHbg2IrNWF5AR`vt>iDdqIJ2DT%IF2r zxwuiwx5E~^ffqk5IaP6sCUShdC2_--J>Nw$q;S~E6aQK_?yxAAX)1`IFU~8Y(zlhl zqipCycKdZ09GM#vp6Z;;)tc5OPGhQk6Cu-tbP=B*BQ%;Nx24f{$8xg<puVV+ z{?#YpVS#5ekyjtp?Fm&T*2yDRfQXKap%s7>(7d!WhAV*Q*~inlyfa$Uxig3AmypKu zgSQ@D$eXrT%!3c zxUbw(+>s$-!uZ~%lJ2cLFC?$s-9@=x-;kr-*CFo$USVRt|v0la9-?3YU;IHu%iWj(FXY6_- zJuq*f3MTf6wocDg<|^Ja)#8BA)}4 zob9Hjtnblcqlar!dNZq9f->o0imo;#8 z%Xp<&K@Hyd;(5a*r>8!8aU+j!7C64_;g~n}4z9J4k`&tC+*y9~s+Pp9_7v)aGUHah z9{Xk4KUk&as4ZjOb;gg-U%gZ380=wR5!aM(a2JMuku2IWI7p1)q>E@0(T16irlVq9 zglwyo=xvu`bN2a;2;q|Zi`ldp+Iw0fP=`;q4~m)heyXsziQ1Vzvj>O7j4o+my_w|G z!aDAan(i*-;Og%v?{P{qVM^Q@WxfCPod?CyN|$2F99|76$l3?(4D{H~7m<>O=O<(5 z^1u@=-88pM-m~Y7i;ejuf{vZ#i1VZLZ6e;?evx;j9-!_%w>!yb29tF-8(8bD)39^N zhA$BHptQ}-+M{f7B;fJb8+3fKmsBUG7Eh1d*39OXJ8gE1Q?i7sdL4)SxN}3BWT}&G z%Lp(cCGpm%6RC=NrbX3SX_TDJ2zJw(!*Zz+s3KF>%*H*J_sRAZG5+4m!1^yrXNVB5tNpx;ofPjQi^#sHkucqIFI;#UBsB+Y%^ z9c1H2mw8qIGo|8gk9~E%jL88GFM;+9Ug3FTd8JtAa$cOX(W@_Zd5y-g(t2u@drIDUcA>0$B#>$TMv^ltfI7Tt7^ab{5uzM& zqx{vfnJnlst{fK0?Vab752Xg4iz>5efLJG%O}rJ(w@p7p1HR`l#hBVC3cdp0j^rrX z59%-^%6Gc<#)tZQEspwIRXN?6%%3!F>$uq@zb|6KtNdn)Y);&0qMcH^Bih*e!{=$# zl+|E>PM5={B?FZzWh7~sURXpCa#sM}%u$m{MeyhwhK@Nl@g{Y;y>mhN@pNf5h}^AL zt=21m(Jia-y^TRl0@{>kh5 zb9vKb)SaDno^|NM0dCY~KFDrpJ?p+R2eft$%#`VR9*U4=uUE4QapGyN^dJZwy1az< z=N`QmwvTPt(k#OBkn^X?r=C%#&!XIm&H(STMq0OYQ_f{eez}{%*C{Ff+@3lsdnW}> z&3!qm?TSkYYv+7U{8;1pe02Rzyc_CSbI=*hIlQIQM2Wovg|u>*W8i1=iGSuiJUz7i zDm`-Z=k)L{vg3Dn3iUv{@EOItw`S50(^2vOOfMq3t6#!kudk7qyPQY_r!ZQ;SU^1dN z$=^+x%e}L*S0wg<}IHk(8|jvE7CY-c-iL<4_x1AA><+wpe^yOdc53$@~XNOdgUGz)$AC=0$$cfWNI=jlx0HVBHF^ z^-EIi=ez^JldP^jL4|@0i!w8_2>9EQFsr_uQILcIOoc@4iJPaxSAcQ-72txwY?kj} zO1_xfcn3N``R4{ftemsQ}yJ<@%2DFr+cnZKvqKscec5#+Qkw<_bP8bx$h_ z=*iweR=+YaN#xtd*MOSE8TQ!+8)_9Le&kX*uHZq~_KA1z^srT2cJ2GY@b(8z``BNE zdg9P!ODw5?O1N=|Dn$4G*IA2_npwMazLe)Bxs{|&Wi0Vf< zsIbIZQw36h9t%SkD_>q>PJif2@eXZ!Y$R@2dsK^UK7HP>%ITT?v#Q3kW-`8yuGd&r zXy7Hx`Sv&A4eplF^E0%j?R=7)7C0n8hBd){S(QtX1G8NW8R(&OW&N#`Z>qAV5Kqt?Q=Rc&dr_a4k*}N z-S!7BkqS|%6rr7ILmyAw0m5srgh++ZMqGQCLYYR}zW4)SIs0|uXCKvf-69rA(Wi1=(?j*2J<4-hM)vu; znP+)$6-6D_$!AyZzn*b2PkerhZ!YhlH9J?QF?;%ikD{DO2AVqZd>*SR;ileGMbQRH z?b~WuFepW+{!<&g7D&4IoFi?R=)} zN-CAX$h8@@s^S(ddFNdkh&t#KapdX}a!L4o8tEXSW_6_embeS&;sZ;6sm6M@i!D6N z=(dmAETX3SDWaV@n$V-QyG!g_n$vGmb`3Qd5|6oOHQ^lIa@Mujt^hEKt~)XBOr+Q< zFD$_v_me|&Ja3;`q_WDhM7=%Cq+=syU}QZg8LoCL`a*mY`sHN5wcxzz{%l>ri_GYu zN+rGP)$oywY7cMrtWUjT9xPm#)1C8au<9P{=#l}!aja?E`utelW?zuSU{WUx@6$n0 zC}hx796iN$^cD=}iYOeK7i^B^>QqgdCQ#IN`X3CE>h5Y3hJ{uXtN-scSGik(n{X%|ij}O>3hNE|RNml+=lRJPL%WoLU|8hy$r7n6sxkd=8GmtVoW7^;P3 zYp4^SV&jk_$FHcDLe%K6p$tYnqI9u46_7KQ=2r6zk#|BnW&1e%{e!$s8piKqcI+v= zc@$x;ChnDoO+<6c$muj_zPA|Yiig*W>j-*wwI~J6UID}2jR_o(^>;a7F^r@YXZhg&=H-qWVbg;#}U5CC!pxsckV3 zBZ^v zoN_wu2}xvYHge=U(PoqqVeqBHq_Dx6{GU0PIK(4OKoKUDB*qw=wb+KxDk5g}yxF2E zOYm3$9`2Nw(vNLSFf(uatc|>LyI{c6)xspzeKtg!;`L1*@7c^oRER7g$Bk&JIHtsn z2)pkBJM-ClS*e<{h8uR~{Q17okA$bF$&-CmBWIhZA6K{M6O++K&b&SU2;dYVM?{~* z84l>u)G1$Ba=LLfq`w~T_F8yhaMYrP3w{eZf?aC!vEp6oLGuJ+pDkRIu;kL%A7Eh; z;T+1)dGgGIR2qJ4@#*ZT8-b1o5a%Q;@te*Qckza_VGw5wbY}>E&3n^f5u31}RrYs(% z_KCyoE)yCP*i8*yZXfBof6}(WIa<@|kk$z5XkxzXGrOGVXiK-@Zo?rcF%0@?26Xb` zs_BEI7aQ^=QdAvUdkNjJF$?rzgkSOC7Pw(}W)8e+UwoC`pv7RX7Dh*y>r<-knJGE8 zk9)(n$i6R}Am}_#3^Pr`#8P4cp=!N!&^p#rZJ=ls(t;TG$WgC`%8Ec3jI#JFtWVa4 zTL-RSC|x~hF~F*DrGBKif}3|yPy(C|_X;Prb;`oHt|;Yd7q);KC5F=3Y0KL}B3!?8 z%4)!6xB8gG*`%J`4zJB#9LekIek$AO#E+4sE|~7mGf5{lo_r$3jDlvwh7oUr_T8Z3 z&Ptcuk{}#D-s5sHQ*Lke2vq~cS<-#9bwYS8=l}qM<0^9IFu z{-xAmu6_Jb(Nzc&DT_#x!i#SV&NH)SB=3oZ0J=0)u5Ad^dzVyQWU<>neU3-V7Dwf# z5Ki})oRq@l>EH*s99ko40*73YI}*~m85la;DZ){C7HPDi5+uvgfLo0r3fiLLvII0H zTswZRlvMV`euUQ}MuQ0*LGq;Ik$FZo1u=9MM9&J@ zOLjWocmyA9FoR793ro||0H<%lvFEUu?-f?Xq#6V;rIT%FqNH6!$98bT0~Vl5x=7kH zWhYJg)*ICe@XP8yGw~V>H0^i=$gf|i0Zj1gF7#DWR|e4KsItH>Oyi)eLtDY33@w-+ z65OV=OaUcwgSTdIJtw*R>>GV7#sX1VY;B<0hdE9i6+=W6SbC78l3EGa6I)Aqh(8Kc zijCe3yy=In`VFhRt6Kg)mUh6AU+WjXqqc^FARs)f1y*p8ZyX6Xd{^CoDGA^8g{2=$ z9e#K7kLQJdrvn5486=_p75P=b)_?=IuGj0Pepe8+xtd_#4h%G%v>Uu>6Z~)0ed#Gc z%bI)q1iY}rcjqGc5%9I8uo7#PVzL7)1U4WYm5cLjFf z)7SL-K{t|)>5|3z@THUt?-B8>_UEU;mET4^?Sk z6`ln4aVz5ESZ~Fa59n(_|eOrS0?rv*tSNuDF7N!Ekq1XTwD#7m_@D(4@@h8N= zG}Z$-DV$egyd!@g~d&a9}rNwT)5`Eq{rR@2g8cn)bUGxUt#s=wT4V-t~<1 zn@EfDVwm^@op8;cCy)@tYVE>L1k*urb%3B4`)^o=*hNbMe<<+&(I-FyK@EO8mb9CMRbG&|=UGR~TILLU)dP(A{ zACkt{P5OamZ;-etlWYAkNB`guYq RULES = new ArrayList() {{ //Build-in Hosts rule providers + add(new Rule("iTXTech/Daedalus/Default", "daedalus-default.hosts", Rule.TYPE_HOSTS, + "https://raw.githubusercontent.com/iTXTech/Daedalus/master/default.hosts", false)); add(new Rule("googlehosts/hosts", "googlehosts.hosts", Rule.TYPE_HOSTS, "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts", false)); add(new Rule("vokins/yhosts", "vokins.hosts", Rule.TYPE_HOSTS, diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cfe084a..2a7507e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -87,6 +87,7 @@ PdoMo DNS 辅服务器 PureDNS 华南 PureDNS 华北 + 红鱼 (DoT/DOH) 首选 DNS 服务器 备用 DNS 服务器 @@ -99,4 +100,4 @@ google.com 版本: - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2fd1665..1a3de53 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -87,6 +87,7 @@ PdoMo DNS 輔伺服器 PureDNS 華南 PureDNS 華北 + 紅魚 (DoT/DOH) 主要 DNS 伺服器 次要 DNS 伺服器 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d469579..7368e97 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,6 +92,7 @@ PdoMo DNS Secondary PureDNS South China PureDNS North China + rubyfish (DoT/DOH) Primary DNS server Secondary DNS server diff --git a/default.host b/default.host new file mode 100644 index 0000000..d6470fe --- /dev/null +++ b/default.host @@ -0,0 +1,5 @@ +# rubyfish +# Ease Asia +115.159.154.226 dns.rubyfish.cn +# West USA +# 47.99.165.31 dns.rubyfish.cn