Support proxy

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

@@ -386,72 +386,6 @@ public class Settings {
         putString(KEY_EXCLUDED_LANGUAGES, value);
     }
 
-    private static final String KEY_HATH_PROXY = "hath_proxy";
-    private static final boolean DEFAULT_HATH_PROXY = false;
-
-    public static boolean getHathProxy() {
-        return getBoolean(KEY_HATH_PROXY, DEFAULT_HATH_PROXY);
-    }
-
-    public static void putHathProxy(boolean value) {
-        if (value) {
-            sEhConfig.hahClientIp = Settings.getHathIp();
-            sEhConfig.hahClientPort = Settings.getHathPort();
-            sEhConfig.hahClientPasskey = Settings.getHathPasskey();
-        } else {
-            sEhConfig.hahClientIp = DEFAULT_HATH_IP;
-            sEhConfig.hahClientPort = DEFAULT_HATH_PORT;
-            sEhConfig.hahClientPasskey = DEFAULT_HATH_PASSKEY;
-        }
-        sEhConfig.setDirty();
-        putBoolean(KEY_HATH_PROXY, value);
-    }
-
-    private static final String KEY_HATH_IP = "hath_ip";
-    private static final String DEFAULT_HATH_IP = null;
-
-    public static String getHathIp() {
-        return getString(KEY_HATH_IP, DEFAULT_HATH_IP);
-    }
-
-    public static void putHathIp(String value) {
-        if (Settings.getHathProxy()) {
-            sEhConfig.hahClientIp = value;
-            sEhConfig.setDirty();
-        }
-        putString(KEY_HATH_IP, value);
-    }
-
-    private static final String KEY_HATH_PORT = "hath_port";
-    private static final int DEFAULT_HATH_PORT = -1;
-
-    public static int getHathPort() {
-        return getInt(KEY_HATH_PORT, DEFAULT_HATH_PORT);
-    }
-
-    public static void putHathPort(int value) {
-        if (Settings.getHathProxy()) {
-            sEhConfig.hahClientPort = value;
-            sEhConfig.setDirty();
-        }
-        putInt(KEY_HATH_PORT, value);
-    }
-
-    private static final String KEY_HATH_PASSKEY = "hath_passkey";
-    private static final String DEFAULT_HATH_PASSKEY = null;
-
-    public static String getHathPasskey() {
-        return getString(KEY_HATH_PASSKEY, DEFAULT_HATH_PASSKEY);
-    }
-
-    public static void putHathPasskey(String value) {
-        if (Settings.getHathProxy()) {
-            sEhConfig.hahClientPasskey = value;
-            sEhConfig.setDirty();
-        }
-        putString(KEY_HATH_PASSKEY, value);
-    }
-
     private static final String KEY_CELLULAR_NETWORK_WARNING = "cellular_network_warning";
     private static final boolean DEFAULT_CELLULAR_NETWORK_WARNING = false;
 
@@ -1066,6 +1000,39 @@ public class Settings {
         putString(KEY_APP_LANGUAGE, value);
     }
 
+    private static final String KEY_PROXY_TYPE = "proxy_type";
+    private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM;
+
+    public static int getProxyType() {
+        return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
+    }
+
+    public static void putProxyType(int value) {
+        putInt(KEY_PROXY_TYPE, value);
+    }
+
+    private static final String KEY_PROXY_IP = "proxy_ip";
+    private static final String DEFAULT_PROXY_IP = null;
+
+    public static String getProxyIp() {
+        return getString(KEY_PROXY_IP, DEFAULT_PROXY_IP);
+    }
+
+    public static void putProxyIp(String value) {
+        putString(KEY_PROXY_IP, value);
+    }
+
+    private static final String KEY_PROXY_PORT = "proxy_port";
+    private static final int DEFAULT_PROXY_PORT = -1;
+
+    public static int getProxyPort() {
+        return getInt(KEY_PROXY_PORT, DEFAULT_PROXY_PORT);
+    }
+
+    public static void putProxyPort(int value) {
+        putInt(KEY_PROXY_PORT, value);
+    }
+
     /********************
      ****** Guide
      ********************/