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

Updated hosts source, added https://github.com/sy618/hosts

Browse Source
This commit is contained in:
PeratX 2017-04-29 14:22:22 +08:00
parent 6c73452bf3
commit 1e9c4d0312
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -37,6 +37,7 @@ Open Source Licenses
* __[MiniDNS](https://github.com/rtreffer/minidns)__ by *[Rene Treffer](https://github.com/rtreffer)* - [LGPLv2.1](https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1)
* __[hosts](https://github.com/racaljk/hosts)__ by *[Cthulhu](https://github.com/racaljk)* - [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh)
* __[google-hosts](https://github.com/fengixng/google-hosts)__ by *[fengixng](https://github.com/fengixng)* - None
* __[hosts](https://github.com/sy618/hosts)__ by *[sy618](https://github.com/sy618)* - [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.zh)
License
------------

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

@ -60,6 +60,7 @@
<br>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS is for academic purposes only!</div>
<div style="font-size: 12px; color: gray;">Users must comply with local laws and regulations.</div>
<br>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017 by iTXTech <a href="mailto:admin@itxtech.org">admin@itxtech.org</a>
</div>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017 by PeratX <a href="mailto:peratx@itxtech.org">peratx@itxtech.org</a>
@ -95,6 +96,8 @@
<a href="https://github.com/racaljk/hosts">hosts</a>: <a
href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh">CC BY-NC-SA 4.0</a><br>
<a href="https://github.com/fengixng/google-hosts">google-hosts</a>: None<br>
<a href="https://github.com/sy618/hosts">hosts</a>: <a
href="https://creativecommons.org/licenses/by/4.0/deed.zh">CC BY 4.0</a><br>
</div>
</body>
</html>

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

@ -60,6 +60,7 @@
<br>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS 仅限用于学术目的！</div>
<div style="font-size: 12px; color: gray;">使用者必须遵守当地法律法规。</div>
<br>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017 by iTXTech <a href="mailto:admin@itxtech.org">admin@itxtech.org</a>
</div>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017 by PeratX <a href="mailto:peratx@itxtech.org">peratx@itxtech.org</a>
@ -95,6 +96,8 @@
<a href="https://github.com/racaljk/hosts">hosts</a>: <a
href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh">CC BY-NC-SA 4.0</a><br>
<a href="https://github.com/fengixng/google-hosts">google-hosts</a>: None<br>
<a href="https://github.com/sy618/hosts">hosts</a>: <a
href="https://creativecommons.org/licenses/by/4.0/deed.zh">CC BY 4.0</a><br>
</div>
</body>
</html>

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

@ -48,8 +48,9 @@ public class Daedalus extends Application {
}};
public static final List<HostsProvider> HOSTS_PROVIDERS = new ArrayList<HostsProvider>() {{
add(new HostsProvider("racaljk", "https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts"));
add(new HostsProvider("fengixng", "https://raw.githubusercontent.com/fengixng/google-hosts/master/hosts"));
add(new HostsProvider("racaljk/hosts", "https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts"));
add(new HostsProvider("fengixng/google-hosts", "https://raw.githubusercontent.com/fengixng/google-hosts/master/hosts"));
add(new HostsProvider("sy618/hosts", "https://raw.githubusercontent.com/sy618/hosts/master/ADFQ"));
}};
public static final String[] DEFAULT_TEST_DOMAINS = new String[]{