From 1e9c4d0312daf773c4d57436120117a1646a1325 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sat, 29 Apr 2017 14:22:22 +0800 Subject: [PATCH] Updated hosts source, added https://github.com/sy618/hosts --- README.md | 1 + app/src/main/assets/about_html/index.html | 3 +++ app/src/main/assets/about_html/index_zh.html | 3 +++ app/src/main/java/org/itxtech/daedalus/Daedalus.java | 5 +++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04f2826..3521b45 100644 --- a/README.md +++ b/README.md @@ -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 ------------ diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index 4fc7d6a..cc41e1c 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -60,6 +60,7 @@
AIXYZ DNS is for academic purposes only!
Users must comply with local laws and regulations.
+
Copyright (C) 2017 by iTXTech admin@itxtech.org
Copyright (C) 2017 by PeratX peratx@itxtech.org @@ -95,6 +96,8 @@ hosts: CC BY-NC-SA 4.0
google-hosts: None
+ hosts: CC BY 4.0
\ 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 35dd5e5..a4d68ce 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -60,6 +60,7 @@
AIXYZ DNS 仅限用于学术目的!
使用者必须遵守当地法律法规。
+
Copyright (C) 2017 by iTXTech admin@itxtech.org
Copyright (C) 2017 by PeratX peratx@itxtech.org @@ -95,6 +96,8 @@ hosts: CC BY-NC-SA 4.0
google-hosts: None
+ hosts: CC BY 4.0
\ No newline at end of file diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java index 4deeda1..fea86f3 100644 --- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java +++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java @@ -48,8 +48,9 @@ public class Daedalus extends Application { }}; public static final List HOSTS_PROVIDERS = new ArrayList() {{ - 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[]{