Add built-in hosts

app/src/main/java/com/hippo/ehviewer/Hosts.java

@@ -142,7 +142,7 @@ public class Hosts {
   }
 
   @Nullable
-  private static InetAddress toInetAddress(String host, String ip) {
+  public static InetAddress toInetAddress(String host, String ip) {
     if (!isValidHost(host)) {
       return null;
     }

app/src/main/java/com/hippo/ehviewer/Settings.java

@@ -952,6 +952,17 @@ public class Settings {
         return getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE);
     }
 
+    public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts";
+    private static final boolean DEFAULT_BUILT_IN_HOSTS = false;
+
+    public static boolean getBuiltInHosts() {
+        return getBoolean(KEY_BUILT_IN_HOSTS, DEFAULT_BUILT_IN_HOSTS);
+    }
+
+    public static void putBuiltInHosts(boolean value) {
+        putBoolean(KEY_BUILT_IN_HOSTS, value);
+    }
+
     /********************
      ****** Guide
      ********************/

app/src/main/java/com/hippo/ehviewer/client/EhDns.java

@@ -23,15 +23,34 @@ package com.hippo.ehviewer.client;
 import android.content.Context;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.Hosts;
+import com.hippo.ehviewer.Settings;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import okhttp3.Dns;
 
 public class EhDns implements Dns {
 
+  private static final Map<String, InetAddress> builtInHosts;
+
+  static {
+    Map<String, InetAddress> map = new HashMap<>();
+    put(map, "e-hentai.org", "104.24.255.11");
+    put(map, "forums.e-hentai.org", "94.100.18.243");
+    builtInHosts = map;
+  }
+
+  private static void put(Map<String, InetAddress> map, String host, String ip) {
+    InetAddress address = Hosts.toInetAddress(host, ip);
+    if (address != null) {
+      map.put(host, address);
+    }
+  }
+
   private final Hosts hosts;
 
   public EhDns(Context context) {
@@ -47,6 +66,13 @@ public class EhDns implements Dns {
       return Collections.singletonList(inetAddress);
     }
 
+    if (Settings.getBuiltInHosts()) {
+      inetAddress = builtInHosts.get(hostname);
+      if (inetAddress != null) {
+        return Collections.singletonList(inetAddress);
+      }
+    }
+
     try {
       return Arrays.asList(InetAddress.getAllByName(hostname));
     } catch (NullPointerException e) {

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

@@ -493,8 +493,10 @@
     <string name="settings_advanced_clear_memory_cache">清理内存缓存</string>
     <string name="settings_advanced_clear_memory_cache_summary">清理缩略图、画廊信息的内存缓存</string>
     <string name="settings_advanced_read_cache_size">阅读缓存大小</string>
+    <string name="settings_advanced_built_in_hosts_title">内置 hosts.txt</string>
+    <string name="settings_advanced_built_in_hosts_summary">应用提供的主机到IP的映射\n可被自定义 hosts.txt 覆盖</string>
     <string name="settings_advanced_custom_hosts_title">自定义 hosts.txt</string>
-    <string name="settings_advanced_custom_hosts_summary">将主机名称映射到相应的IP地址</string>
+    <string name="settings_advanced_custom_hosts_summary">将主机名称映射到相应的IP地址\n可覆盖内置 hosts.txt</string>
     <string name="settings_privacy_pattern_protection_title">图案保护</string>
     <string name="settings_privacy_pattern_protection_not_set">未设置图案保护</string>
     <string name="settings_privacy_pattern_protection_set">已设置图案保护</string>

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

@@ -493,8 +493,10 @@
     <string name="settings_advanced_clear_memory_cache">清理內存緩存</string>
     <string name="settings_advanced_clear_memory_cache_summary">清理縮略圖、畫廊信息的內存緩存</string>
     <string name="settings_advanced_read_cache_size">閲讀緩存大小</string>
+    <string name="settings_advanced_built_in_hosts_title">內置 hosts.txt</string>
+    <string name="settings_advanced_built_in_hosts_summary">應用提供的主機到IP的映射\n可被自定義 hosts.txt 覆蓋</string>
     <string name="settings_advanced_custom_hosts_title">自定義 hosts.txt</string>
-    <string name="settings_advanced_custom_hosts_summary">將主機名稱對映到相應的IP位址</string>
+    <string name="settings_advanced_custom_hosts_summary">將主機名稱映射到相應的IP地址\n可覆蓋內置 hosts.txt</string>
     <string name="settings_privacy_pattern_protection_title">圖案保護</string>
     <string name="settings_privacy_pattern_protection_not_set">未設置圖案保護</string>
     <string name="settings_privacy_pattern_protection_set">已設置圖案保護</string>

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

@@ -493,8 +493,10 @@
     <string name="settings_advanced_clear_memory_cache">清除記憶體快取</string>
     <string name="settings_advanced_clear_memory_cache_summary">清除縮圖、圖庫詳細資料的記憶體快取</string>
     <string name="settings_advanced_read_cache_size">閱讀快取大小</string>
+    <string name="settings_advanced_built_in_hosts_title">內建 hosts.txt</string>
+    <string name="settings_advanced_built_in_hosts_summary">應用提供的主機到IP的對映\n可被自定義 hosts.txt 覆蓋</string>
     <string name="settings_advanced_custom_hosts_title">自定義 hosts.txt</string>
-    <string name="settings_advanced_custom_hosts_summary">將主機名稱對映到相應的IP位址</string>
+    <string name="settings_advanced_custom_hosts_summary">將主機名稱對映到相應的IP位址\n可覆蓋內建 hosts.txt</string>
     <string name="settings_privacy_pattern_protection_title">繪圖解鎖</string>
     <string name="settings_privacy_pattern_protection_not_set">尚未設定繪圖解鎖</string>
     <string name="settings_privacy_pattern_protection_set">已設定繪圖解鎖</string>

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

@@ -536,8 +536,10 @@
     <string name="settings_advanced_clear_memory_cache">Clear memory cache</string>
     <string name="settings_advanced_clear_memory_cache_summary">Clear thumb, gallery info memory cache</string>
     <string name="settings_advanced_read_cache_size">Read cache size</string>
+    <string name="settings_advanced_built_in_hosts_title">Built-in hosts.txt</string>
+    <string name="settings_advanced_built_in_hosts_summary">The host-to-IP mapping provided by the app\nIt can be overrode by custom hosts.txt</string>
     <string name="settings_advanced_custom_hosts_title">Custom hosts.txt</string>
-    <string name="settings_advanced_custom_hosts_summary">Map hostnames to IP addresses</string>
+    <string name="settings_advanced_custom_hosts_summary">Map hostnames to IP addresses\nIt can override built-in hosts.txt</string>
     <string name="settings_privacy_pattern_protection_title">Pattern protection</string>
     <string name="settings_privacy_pattern_protection_not_set">Pattern protection has not been set</string>
     <string name="settings_privacy_pattern_protection_set">Pattern protection has been set</string>

app/src/main/res/xml/advanced_settings.xml

@@ -48,12 +48,18 @@
         app:entryValues="@array/read_cache_size_entry_values"
         android:defaultValue="160"/>
 
+    <com.hippo.preference.SwitchPreference
+        android:key="built_in_hosts"
+        android:title="@string/settings_advanced_built_in_hosts_title"
+        android:summary="@string/settings_advanced_built_in_hosts_summary"
+        android:defaultValue="false"/>
+
     <com.hippo.preference.ActivityPreference
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:key="custom_hosts"
         android:title="@string/settings_advanced_custom_hosts_title"
         android:summary="@string/settings_advanced_custom_hosts_summary"
-        app:activity="com.hippo.ehviewer.ui.HostsActivity" />
+        app:activity="com.hippo.ehviewer.ui.HostsActivity"/>
 
     <Preference
         android:key="export_data"