修复了自定义host不生效的问题

Author: xiaojieonly

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

@@ -78,6 +78,31 @@ public InetAddress get(String host) {
     }
   }
 
+  /**
+   * Gets a List<InetAddress> with the host.
+   */
+  @Nullable
+  public List<InetAddress> getList(String host) {
+    if (!isValidHost(host)) {
+      return null;
+    }
+
+    Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + " WHERE " + COLUMN_HOST  + " = ?;", new String[] {host});
+    List<InetAddress> list = new ArrayList<>();
+    try {
+      while (cursor.moveToNext()) {
+        String ip = SqlUtils.getString(cursor, COLUMN_IP, null);
+        InetAddress inetAddress = toInetAddress(host, ip);
+        if (inetAddress != null) {
+          list.add(inetAddress);
+        }
+      }
+      return list;
+    } finally {
+      cursor.close();
+    }
+  }
+
   private boolean contains(String host) {
     Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + " WHERE " + COLUMN_HOST  + " = ?;", new String[] {host});
     try {

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

@@ -139,21 +139,21 @@ private static void put(Map<String, List<InetAddress>> map, String host, String.
     @NonNull
     @Override
     public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException {
-
-        List<InetAddress> inetAddresses = (List<InetAddress>) hosts.get(hostname);
-        if (inetAddresses != null) {
-            Collections.shuffle(inetAddresses, new Random(System.currentTimeMillis()));
-            return inetAddresses;
+        List<InetAddress> inetAddresses = hosts.getList(hostname);
+        if(inetAddresses==null){
+            inetAddresses = new ArrayList<>();
         }
+
         if (Settings.getBuiltInHosts() || Settings.getBuiltEXHosts()) {
-            inetAddresses = builtInHosts.get(hostname);
-            if (inetAddresses != null) {
-                Collections.shuffle(inetAddresses, new Random(System.currentTimeMillis()));
-                return inetAddresses;
+            List<InetAddress> appHosts = builtInHosts.get(hostname);
+            if (appHosts != null) {
+                inetAddresses.addAll(appHosts);
             }
+            Collections.shuffle(inetAddresses, new Random(System.currentTimeMillis()));
+            return inetAddresses;
         }
         if (Settings.getDoH()) {
-            inetAddresses = dnsOverHttps.lookup(hostname);
+            inetAddresses.addAll(dnsOverHttps.lookup(hostname));
             if (!inetAddresses.isEmpty()) {
                 Collections.shuffle(inetAddresses, new Random(System.currentTimeMillis()));
                 return inetAddresses;