Fix app crashes when proxy is set to direct.

This commit is contained in:
Docile-Alligator 2025-10-20 10:17:12 -04:00
parent 848787297e
commit 587bb95413
2 changed files with 14 additions and 10 deletions

View File

@ -59,12 +59,14 @@ abstract class NetworkModule {
if (proxyEnabled) {
Proxy.Type proxyType = Proxy.Type.valueOf(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_TYPE, "HTTP"));
String proxyHost = mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_HOSTNAME, "127.0.0.1");
int proxyPort = Integer.parseInt(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_PORT, "1080"));
if (proxyType != Proxy.Type.DIRECT) {
String proxyHost = mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_HOSTNAME, "127.0.0.1");
int proxyPort = Integer.parseInt(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_PORT, "1080"));
InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
Proxy proxy = new Proxy(proxyType, proxyAddr);
builder.proxy(proxy);
InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
Proxy proxy = new Proxy(proxyType, proxyAddr);
builder.proxy(proxy);
}
}
return builder.build();

View File

@ -32,12 +32,14 @@ public class ProxyEnabledGlideModule extends AppGlideModule {
boolean proxyEnabled = mProxySharedPreferences.getBoolean(SharedPreferencesUtils.PROXY_ENABLED, false);
if (proxyEnabled) {
Proxy.Type proxyType = Proxy.Type.valueOf(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_TYPE, "HTTP"));
String proxyHost = mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_HOSTNAME, "127.0.0.1");
int proxyPort = Integer.parseInt(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_PORT, "1080"));
if (proxyType != Proxy.Type.DIRECT) {
String proxyHost = mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_HOSTNAME, "127.0.0.1");
int proxyPort = Integer.parseInt(mProxySharedPreferences.getString(SharedPreferencesUtils.PROXY_PORT, "1080"));
InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
Proxy proxy = new Proxy(proxyType, proxyAddr);
builder.proxy(proxy);
InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
Proxy proxy = new Proxy(proxyType, proxyAddr);
builder.proxy(proxy);
}
}
OkHttpUrlLoader.Factory factory = new OkHttpUrlLoader.Factory(builder.build());