From c4a54b5c8f8c18e2edc19aff97a42f97c9daf564 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sat, 10 Nov 2018 13:28:30 +0800 Subject: [PATCH] readme: update --- README.md | 43 ++++++++----------- .../daedalus/provider/HttpsIetfProvider.java | 14 ++---- .../daedalus/provider/HttpsJsonProvider.java | 12 ++---- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/perf_settings.xml | 4 +- 7 files changed, 30 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 8ab34b9..958296d 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ -iTXTech Daedalus -=============== -__No root required Android DNS modifier and Hosts/DNSMasq resolver.__ +# iTXTech Daedalus [![Donate](https://img.shields.io/badge/alipay-donate-yellow.svg)](https://qr.alipay.com/a6x07022gffiehykicipv1a) [![Build Status](https://travis-ci.org/iTXTech/Daedalus.svg?branch=master)](https://travis-ci.org/iTXTech/Daedalus) [![Jenkins](https://img.shields.io/jenkins/s/http/dev.itxtech.org:10298/job/Daedalus.svg)](http://dev.itxtech.org:10298/job/Daedalus/) -Installation -------------- +__No root required Android DNS modifier and Hosts/DNSMasq resolver.__ + +## Installation * __[Jenkins](http://dev.itxtech.org:10298/job/Daedalus/)__ - Debug signature * __[Releases](https://github.com/iTXTech/Daedalus/releases)__ - Release signature * __[Play Test](https://play.google.com/apps/testing/org.itxtech.daedalus)__ - Release signature @@ -16,16 +15,12 @@ Installation src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80">](https://play.google.com/store/apps/details?id=org.itxtech.daedalus) -Chat -------------- +## Useful links * __[Telegram](https://t.me/iTXTechDaedalus)__ +* __[Wiki](https://github.com/iTXTech/Daedalus/wiki)__ - __See before using DoH__ -Manual -------------- -* __[Wiki](https://github.com/iTXTech/Daedalus/wiki)__ +## Introduction -Introduction -------------- This application can create a VPN tunnel to modify the DNS settings on Android.
Through the DNS server and rules which are provided by third parties, users can visit Google, Twitter and so on via https protocol directly without a VPN.

@@ -49,27 +44,28 @@ Supported DNS Query Methods: __Users must comply with local laws and regulations.__
-DNS Server Providers -------------- +## DNS Server Providers + * __CuteDNS__ - *Shutdown according to regulations* * __[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 -------------- +## Rule Providers + +* __[Daedalus Default](https://github.com/iTXTech/Daedalus/blob/master/default.hosts)__ - __Default Rules for Built-in DoH servers__ * __[hosts](https://github.com/googlehosts/hosts)__ by *[googlehosts](https://github.com/googlehosts)* - [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh) * __[yhosts](https://github.com/vokins/yhosts)__ by *[vokins](https://github.com/vokins)* - [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/) -Requirements -------------- +## Requirements + * Minimum Android version: 4.0.3 (API 15) - __*Basic VPN functions*__ * Recommended Android version: >= 5.0 (API 21) - __*Full features*__ * Best Android version: >= 7.1 (API 25) - __*Launcher shortcuts*__ -Open Source Licenses -------------- +## Open Source Licenses + * __[ClearEditText](https://github.com/MrFuFuFu/ClearEditText)__ by *[Yuan Fu](https://github.com/MrFuFuFu)* - [APL 2.0](https://github.com/MrFuFuFu/ClearEditText) * __[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) @@ -77,13 +73,12 @@ Open Source Licenses * __[Gson](https://github.com/google/gson)__ by *[Google](https://github.com/google)* - [APL 2.0](https://github.com/google/gson/blob/master/LICENSE) * __[Shadowsocks](https://github.com/shadowsocks/shadowsocks-android)__ by *[Shadowsocks](https://github.com/shadowsocks)* - [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE) -Credits ------------- +## Credits + * __[JetBrains](https://www.jetbrains.com/)__ - For providing free license for [IntelliJ IDEA](https://www.jetbrains.com/idea/) * __[ShenniaoTech](https://www.sncidc.com/)__ - For supporting us with love -License ------------- +## License Copyright (C) 2017-2018 iTX Technologies diff --git a/app/src/main/java/org/itxtech/daedalus/provider/HttpsIetfProvider.java b/app/src/main/java/org/itxtech/daedalus/provider/HttpsIetfProvider.java index 539d4a3..0b81e91 100644 --- a/app/src/main/java/org/itxtech/daedalus/provider/HttpsIetfProvider.java +++ b/app/src/main/java/org/itxtech/daedalus/provider/HttpsIetfProvider.java @@ -22,21 +22,13 @@ import java.util.concurrent.TimeUnit; * (at your option) any later version. */ public class HttpsIetfProvider extends HttpsProvider { - // implemented https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-11 - private static final OkHttpClient HTTP_CLIENT = new OkHttpClient.Builder() .connectTimeout(10, TimeUnit.SECONDS) .readTimeout(10, TimeUnit.SECONDS) .writeTimeout(10, TimeUnit.SECONDS) - .addInterceptor((chain) -> { - Request original = chain.request(); - - Request request = original.newBuilder() - .header("Accept", "application/dns-message") - .build(); - - return chain.proceed(request); - }) + .addInterceptor((chain) -> chain.proceed(chain.request().newBuilder() + .header("Accept", "application/dns-message") + .build())) .build(); public HttpsIetfProvider(ParcelFileDescriptor descriptor, DaedalusVpnService service) { diff --git a/app/src/main/java/org/itxtech/daedalus/provider/HttpsJsonProvider.java b/app/src/main/java/org/itxtech/daedalus/provider/HttpsJsonProvider.java index 5bd001e..012aa72 100644 --- a/app/src/main/java/org/itxtech/daedalus/provider/HttpsJsonProvider.java +++ b/app/src/main/java/org/itxtech/daedalus/provider/HttpsJsonProvider.java @@ -36,15 +36,9 @@ public class HttpsJsonProvider extends HttpsProvider { .connectTimeout(10, TimeUnit.SECONDS) .readTimeout(10, TimeUnit.SECONDS) .writeTimeout(10, TimeUnit.SECONDS) - .addInterceptor((chain) -> { - Request original = chain.request(); - - Request request = original.newBuilder() - .header("Accept", "application/dns-json") - .build(); - - return chain.proceed(request); - }) + .addInterceptor((chain) -> chain.proceed(chain.request().newBuilder() + .header("Accept", "application/dns-json") + .build())) .build(); public HttpsJsonProvider(ParcelFileDescriptor descriptor, DaedalusVpnService service) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 02955e9..0535f82 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -60,7 +60,7 @@ 支持和帮助 高级系统设置 开启 - 本地规则解析 + 本地规则解析 使用手册 访问 GitHub wiki 页面。 日志大小限制 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 46b8d21..774fa36 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -60,7 +60,7 @@ 支援與說明 進階系統設定 開啟 - 本機規則解析 + 本機規則解析 使用手冊 造訪 GitHub wiki 頁面。 紀錄檔大小限制 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9c4afd..51b48fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,7 +59,7 @@ Help & Support Advanced System Settings On - Local Rules Resolution + Local Rules Resolver Log Size Limit Manual Visit GitHub wiki page. diff --git a/app/src/main/res/xml/perf_settings.xml b/app/src/main/res/xml/perf_settings.xml index 0e1a1f2..cf28622 100644 --- a/app/src/main/res/xml/perf_settings.xml +++ b/app/src/main/res/xml/perf_settings.xml @@ -62,7 +62,7 @@ android:enabled="false"/> - \ No newline at end of file +