This commit is contained in:
PeratX 2017-05-26 14:52:38 +08:00
parent d71bd53072
commit 07ae91b2ac
4 changed files with 9 additions and 17 deletions

View File

@ -36,6 +36,13 @@ DNS server providers
* __[Pure DNS](http://puredns.cn/)__ - *I DO NOT KNOW HOW TO DESCRIBE~~~*
* __[AIXYZ DNS](https://aixyz.com/)__ - __*For academic purposes only.*__
Rule providers
-------------
* __[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)
* __[connector](https://git.oschina.net/lengers/connector)__ by *[lankes](https://git.oschina.net/lengers)* - [GPLv3](https://git.oschina.net/lengers/connector/blob/master/LICENSE)
Requirements
-------------
* Minimum Android version: 4.0.3 (API 15) - __*Basic VPN functions*__
@ -48,9 +55,6 @@ Open Source Licenses
* __[DNS66](https://github.com/julian-klode/dns66)__ by *[Julian Andres Klode](https://github.com/julian-klode)* - [GPLv3](https://github.com/julian-klode/dns66/blob/master/COPYING)
* __[Pcap4J](https://github.com/kaitoy/pcap4j)__ by *[Kaito Yamada](https://github.com/kaitoy)* - [MIT](https://github.com/kaitoy/pcap4j)
* __[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)
* __[Gson](https://github.com/google/gson)__ by *[Google](https://github.com/google)* - [APL 2.0](https://github.com/google/gson/blob/master/LICENSE)
License

View File

@ -93,11 +93,6 @@
<a href="https://github.com/kaitoy/pcap4j">Pcap4J</a>: <a href="https://github.com/kaitoy/pcap4j">MIT</a><br>
<a href="https://github.com/rtreffer/minidns">MiniDNS</a>: <a
href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br>
<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>
<a href="https://github.com/google/gson">Gson</a>: <a
href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a>
</div>

View File

@ -93,11 +93,6 @@
<a href="https://github.com/kaitoy/pcap4j">Pcap4J</a>: <a href="https://github.com/kaitoy/pcap4j">MIT</a><br>
<a href="https://github.com/rtreffer/minidns">MiniDNS</a>: <a
href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br>
<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>
<a href="https://github.com/google/gson">Gson</a>: <a
href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a>
</div>

View File

@ -49,8 +49,6 @@ public class Daedalus extends Application {
private static final String SHORTCUT_ID_ACTIVATE = "shortcut_activate";
private static final String TAG = "Daedalus";
public static final List<DnsServer> DNS_SERVERS = new ArrayList<DnsServer>() {{
/*add(new DnsServer("0", "113.107.249.56", R.string.server_cutedns_north_china));
add(new DnsServer("1", "120.27.103.230", R.string.server_cutedns_east_china));
@ -71,6 +69,8 @@ public class Daedalus extends Application {
"https://raw.githubusercontent.com/sy618/hosts/master/ADFQ", false));
add(new Rule("vokins/yhosts", "vokins.hosts", Rule.TYPE_HOSTS,
"https://raw.githubusercontent.com/vokins/yhosts/master/hosts", false));
add(new Rule("lengers/connector", "connector.hosts", Rule.TYPE_HOSTS,
"https://git.oschina.net/lengers/connector/raw/master/hosts", false));
//Build-in DNSMasq rule providers
add(new Rule("sy618/hosts/dnsad", "dnsad.dnsmasq", Rule.TYPE_DNAMASQ,
"https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsad", false));
@ -108,8 +108,6 @@ public class Daedalus extends Application {
if (getExternalFilesDir(null) != null) {
rulesPath = getExternalFilesDir(null).getPath() + "/rules/";
configPath = getExternalFilesDir(null).getPath() + "/config.json";
File file = new File(rulesPath);
}
initData();