yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove unsupported proxy types"

Browse Source 
This reverts commit be761071f8.
This commit is contained in:
tarsin committed 2023-02-13 17:27:07 +08:00
1 parent d6939b2913
commit 388685b784
4 files changed
+18 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/Settings.java
+2 -6
View File
@@ -196,7 +196,7 @@ public class Settings {
private static final boolean DEFAULT_FRONTING = false;
private static final boolean DEFAULT_BYPASS_VPN = true;
private static final String KEY_PROXY_TYPE = "proxy_type";
private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_DIRECT;
private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM;
private static final String KEY_PROXY_IP = "proxy_ip";
private static final String DEFAULT_PROXY_IP = null;
private static final String KEY_PROXY_PORT = "proxy_port";
@@ -692,12 +692,8 @@ public class Settings {
return getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN);
}
private static int getProxyTypeInternal() {
return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
}
public static int getProxyType() {
return getProxyTypeInternal() == EhProxySelector.TYPE_HTTP ? EhProxySelector.TYPE_HTTP : DEFAULT_PROXY_TYPE;
return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
}
public static void putProxyType(int value) {