From bb2057969071939a0449124f1f39465cd6d7a8a3 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Wed, 14 Feb 2018 14:31:09 +0800
Subject: [PATCH] Added PdoMo-DNS(https://pdomo.me/)
---
README.md | 3 ++-
app/src/main/assets/about_html/index.html | 3 +++
app/src/main/assets/about_html/index_zh.html | 3 +++
app/src/main/assets/about_html/pdomo.jpg | Bin 0 -> 13156 bytes
.../java/org/itxtech/daedalus/Daedalus.java | 2 ++
app/src/main/res/values-zh-rCN/strings.xml | 3 ++-
app/src/main/res/values-zh-rTW/strings.xml | 3 ++-
app/src/main/res/values/strings.xml | 3 ++-
gradle/wrapper/gradle-wrapper.properties | 2 +-
9 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 app/src/main/assets/about_html/pdomo.jpg
diff --git a/README.md b/README.md
index 45c0588..71082b9 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ DNS Server Providers
* __[Pure DNS](https://puredns.cn/)__ - *Shutdown according to regulations*
* __[AIXYZ DNS](https://aixyz.com/)__ - __*For academic purposes only.*__
* __[FUN DNS](http://fundns.cn)__ - *The Most Pure Domain Name Resolution Service*
+* __[PdoMo-DNS](https://pdomo.me/)__ - *Intelligent Free Public DNS*
Rule Providers
-------------
@@ -73,7 +74,7 @@ Open Source Licenses
Credits
------------
* __[Jetbrains](https://www.jetbrains.com/)__ - For providing free license for [IntelliJ IDEA](https://www.jetbrains.com/idea/)
-* __[ZXDA Cloud](https://cloud.zxda.net/)__ - For donating free VPS
+* __[SNC IDC](http://www.sncidc.com/)__ - For supporting us with love
License
------------
diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html
index b54bf84..bf042c4 100644
--- a/app/src/main/assets/about_html/index.html
+++ b/app/src/main/assets/about_html/index.html
@@ -55,6 +55,9 @@
YmGjoxm6j~reIKD6yo6X1?n{f95F)0}E<&us`owun)+qFpWl)g=Ltvpr(g v?{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<|^J a)#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_sRAZ G5+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(Ji a-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``R 4{ftemsQ}yJ<@%2DFr+cnZKvqKscec5#+Qkw<_bP8bx$h_ z=*iweR=+YaN#xtd*MOSE8TQ!+8)_9Le&kX*uHZq~_KA1z^srT2cJ2GY@b(8z``BNE zdg9 P!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)7C0n8h Bd){S(QtX1G8NW8R(&OW&N#`Z>qAV 5Kqt?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>h5Y3 hJ{uXtN-scSGik(n{X%|ij}O>3hNE|RNml+=lRJ PL%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@Y XZhg&=H-qWVbg;#}U5CC!pxsckV3 z BZ^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%9I8 uo7#PVzL7)1U4WYm5cLjFf z)7SL-K{t|)>5|3z @THUt?-B8>_UEU;mET4^?Sk z6` ln4aVz5ESZ~Fa59n(_|eOrS0?rv*tSNuDF7N!Ekq1XTwD#7m_@D(4@@h8N= z G}Z$-DV$egyd!@g~d&a9}rNwT)5`Eq{rR@2g8cn)bUGxUt#s=wT4V-t~<1 zn@EfDV wm^@op8;cCy)@tYVE>L1k*urb%3B4`)^o=*hNbMe<<+&(I-FyK@E O8mb9CMRbG&|=UGR~TILLU)dP(A{ zACkt{P5OamZ;-etlWYAkNB`guYq DNS_SERVERS = new ArrayList () {{ add(new DNSServer("119.23.248.241", R.string.server_fundns_south_china)); + add(new DNSServer("101.132.183.99", R.string.server_pdomo_primary)); + add(new DNSServer("193.112.15.186", R.string.server_pdomo_secondary)); add(new DNSServer("115.159.146.99", R.string.server_aixyz_east_china)); add(new DNSServer("123.206.21.48", R.string.server_aixyz_south_china)); }}; diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e70c692..198c8be 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -84,7 +84,8 @@ AIXYZ DNS 华南 AIXYZ DNS 华东 FUN DNS 华南 -FUN DNS 华北 +PdoMo DNS 主服务器 +PdoMo DNS 辅服务器 首选 DNS 服务器 备用 DNS 服务器 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 280a8ca..1dfc4c0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -84,7 +84,8 @@AIXYZ DNS 中國華南 AIXYZ DNS 中國華東 FUN DNS 中國華南 -FUN DNS 中國華北 +PdoMo DNS 主伺服器 +PdoMo DNS 輔伺服器 主要 DNS 伺服器 次要 DNS 伺服器 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a6b33b..b57df3a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,7 +83,8 @@AIXYZ DNS South China AIXYZ DNS East China FUN DNS South China -FUN DNS North China +PdoMo DNS Primary +PdoMo DNS Secondary Primary DNS server Secondary DNS server diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e74c68c..931e585 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-4.5.1-bin.zip