readme: update

README.md

@@ -1,13 +1,12 @@
-iTXTech Daedalus
+# iTXTech Daedalus
-===============
-__No root required Android DNS modifier and Hosts/DNSMasq resolver.__
 
 [![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
+## Introduction
--------------
-* __[Wiki](https://github.com/iTXTech/Daedalus/wiki)__
 
-Introduction
--------------
 This application can create a VPN tunnel to modify the DNS settings on Android.<br>
 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.<br>
 <br>
@@ -49,27 +44,28 @@ Supported DNS Query Methods:
 
 __Users must comply with local laws and regulations.__<br>
 
-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 <admin@itxtech.org>
     

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) -> {
+            .addInterceptor((chain) -> chain.proceed(chain.request().newBuilder()
-                Request original = chain.request();
+                    .header("Accept", "application/dns-message")
-
+                    .build()))
-                Request request = original.newBuilder()
-                        .header("Accept", "application/dns-message")
-                        .build();
-
-                return chain.proceed(request);
-            })
             .build();
 
     public HttpsIetfProvider(ParcelFileDescriptor descriptor, DaedalusVpnService service) {

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) -> {
+            .addInterceptor((chain) -> chain.proceed(chain.request().newBuilder()
-                Request original = chain.request();
+                    .header("Accept", "application/dns-json")
-
+                    .build()))
-                Request request = original.newBuilder()
-                        .header("Accept", "application/dns-json")
-                        .build();
-
-                return chain.proceed(request);
-            })
             .build();
 
     public HttpsJsonProvider(ParcelFileDescriptor descriptor, DaedalusVpnService service) {

app/src/main/res/values-zh-rCN/strings.xml

@@ -60,7 +60,7 @@
     <string name="settings_help_and_support">支持和帮助</string>
     <string name="settings_advanced">高级系统设置</string>
     <string name="settings_advanced_on">开启</string>
-    <string name="settings_local_rules_resolution">本地规则解析</string>
+    <string name="settings_local_rules_resolver">本地规则解析</string>
     <string name="settings_manual">使用手册</string>
     <string name="settings_manual_summary">访问 GitHub wiki 页面。</string>
     <string name="settings_log_size">日志大小限制</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -60,7 +60,7 @@
     <string name="settings_help_and_support">支援與說明</string>
     <string name="settings_advanced">進階系統設定</string>
     <string name="settings_advanced_on">開啟</string>
-    <string name="settings_local_rules_resolution">本機規則解析</string>
+    <string name="settings_local_rules_resolver">本機規則解析</string>
     <string name="settings_manual">使用手冊</string>
     <string name="settings_manual_summary">造訪 GitHub wiki 頁面。</string>
     <string name="settings_log_size">紀錄檔大小限制</string>

app/src/main/res/values/strings.xml

@@ -59,7 +59,7 @@
     <string name="settings_help_and_support">Help &amp; Support</string>
     <string name="settings_advanced">Advanced System Settings</string>
     <string name="settings_advanced_on">On</string>
-    <string name="settings_local_rules_resolution">Local Rules Resolution</string>
+    <string name="settings_local_rules_resolver">Local Rules Resolver</string>
     <string name="settings_log_size">Log Size Limit</string>
     <string name="settings_manual">Manual</string>
     <string name="settings_manual_summary">Visit GitHub wiki page.</string>

app/src/main/res/xml/perf_settings.xml

@@ -62,7 +62,7 @@
                 android:enabled="false"/>
         <SwitchPreference
                 android:key="settings_local_rules_resolution"
-                android:title="@string/settings_local_rules_resolution"
+                android:title="@string/settings_local_rules_resolver"
                 android:defaultValue="false"
                 android:enabled="false"/>
         <SwitchPreference
@@ -104,4 +104,4 @@
                 android:title="@string/settings_manual"
                 android:summary="@string/settings_manual_summary"/>
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>