y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix proxy

Browse Source 
https://github.com/vtosters/lite/issues/505
This commit is contained in:
gdlbo
2022-08-14 21:21:21 +03:00
parent be2b7c99fc
commit 3476e4eed4
2 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java
+2
View File
@@ -4,6 +4,7 @@ import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest;
import static ru.vtosters.lite.utils.CacheUtils.getInstance;
import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList;
import static ru.vtosters.lite.utils.Preferences.checkupdates;
import static ru.vtosters.lite.utils.ProxyUtils.setProxy;
import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
import static ru.vtosters.lite.utils.ThemesUtils.setNeededTheme;
@@ -21,6 +22,7 @@ import ru.vtosters.lite.ui.dialogs.Start;
public class MainActivityInjector {
public static void inject(Activity activity) {
setProxy();
setNeededTheme(activity);
ServerDialog.activity = activity;
sendRequest();
app/src/main/java/ru/vtosters/lite/utils/ProxyUtils.java
+1 -34
View File
@@ -28,7 +28,7 @@ public class ProxyUtils {
return getPrefsValue("proxy").equals("zaborona");
}
private static void setProxyRefl() {
public static void setProxyRefl() {
Log.d("Proxy", "Setting proxy...");
try {
var context = getGlobalContext().getApplicationContext();
@@ -75,13 +75,11 @@ public class ProxyUtils {
System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
System.setProperty("socksProxyPort", "1488");
setProxyRefl();
resetProxySocks();
break;
case "socks":
System.setProperty("socksProxyHost", proxyHostSocks());
System.setProperty("socksProxyPort", proxyPortSocks());
setProxyRefl();
resetProxySocks();
break;
case "http":
System.setProperty("http.proxyHost", proxyHostHTTP());
@@ -89,7 +87,6 @@ public class ProxyUtils {
System.setProperty("http.proxyUser", proxyUserHTTP());
System.setProperty("http.proxyPassword", proxyPassHTTP());
setProxyRefl();
resetProxyHttp();
break;
case "https":
System.setProperty("https.proxyHost", proxyHostHTTPS());
@@ -97,7 +94,6 @@ public class ProxyUtils {
System.setProperty("https.proxyUser", proxyUserHTTPS());
System.setProperty("https.proxyPassword", proxyPassHTTPS());
setProxyRefl();
resetProxyHttps();
break;
default:
resetProxy();
@@ -118,35 +114,6 @@ public class ProxyUtils {
clearProperty("socksPortHost");
} // Reset all proxies
public static void resetProxySocks() {
clearProperty("https.proxyHost");
clearProperty("https.proxyPort");
clearProperty("https.proxyUser");
clearProperty("https.proxyPassword");
clearProperty("http.proxyHost");
clearProperty("http.proxyPort");
clearProperty("http.proxyUser");
clearProperty("http.proxyPassword");
} // Reset all except socks
public static void resetProxyHttp() {
clearProperty("https.proxyHost");
clearProperty("https.proxyPort");
clearProperty("https.proxyUser");
clearProperty("https.proxyPassword");
clearProperty("socksProxyHost");
clearProperty("socksPortHost");
} // Reset all except http
public static void resetProxyHttps() {
clearProperty("http.proxyHost");
clearProperty("http.proxyPort");
clearProperty("http.proxyUser");
clearProperty("http.proxyPassword");
clearProperty("socksProxyHost");
clearProperty("socksPortHost");
} // Reset all except https
private static String proxyHostHTTP() {
var string = getPrefsValue("proxyHostHTTP");
return string.isEmpty() ? "192.168.0.1" : string;