From dd6916c08a0466a4bf874c63751d5f90f1a02b71 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:35:49 +0300
Subject: [PATCH] removed random proxy
---
.../java/ru/vtosters/hooks/ProxyHook.java | 20 +++++++++----------
.../ru/vtosters/lite/proxy/ProxyUtils.java | 7 ++++---
.../ui/fragments/ProxySettingsFragment.java | 16 +++++++--------
smali/res/values-be/arrays.xml | 2 +-
smali/res/values-ru/arrays.xml | 2 +-
smali/res/values-uk/arrays.xml | 2 +-
smali/res/values/arrays.xml | 4 ++--
smali/res/xml/preferences_proxy.xml | 8 ++++----
8 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/ru/vtosters/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/hooks/ProxyHook.java
index b0ddc4042..1924cbef7 100644
--- a/app/src/main/java/ru/vtosters/hooks/ProxyHook.java
+++ b/app/src/main/java/ru/vtosters/hooks/ProxyHook.java
@@ -108,22 +108,22 @@ public class ProxyHook {
RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
RadioButton rgZaborona = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
- RadioButton rgRandomProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+// RadioButton rgRandomProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
SwitchHook.setCompoundButton(rgDefault);
SwitchHook.setCompoundButton(rgZaborona);
- SwitchHook.setCompoundButton(rgRandomProxy);
+// SwitchHook.setCompoundButton(rgRandomProxy);
SwitchHook.setCompoundButton(rgVika);
rg.addView(rgDefault);
rg.addView(rgVika);
rg.addView(rgZaborona);
- rg.addView(rgRandomProxy);
+// rg.addView(rgRandomProxy);
rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
rgZaborona.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
- rgRandomProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+// rgRandomProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
rgVika.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
rg.setPadding(dp2px(18f), dp2px(12f), dp2px(18f), 0);
@@ -134,15 +134,15 @@ public class ProxyHook {
rgZaborona.setText(ctx.getString(R.string.proxy_enable) + " (Zaborona)");
rgZaborona.setTextColor(getTextAttr());
- rgRandomProxy.setText(ctx.getString(R.string.proxy_enable) + " (Random Socks Proxy)");
- rgRandomProxy.setTextColor(getTextAttr());
+// rgRandomProxy.setText(ctx.getString(R.string.proxy_enable) + " (Random Socks Proxy)");
+// rgRandomProxy.setTextColor(getTextAttr());
rgVika.setText(ctx.getString(R.string.proxy_enable) + " (Vika Mobile)");
rgVika.setTextColor(getTextAttr());
rgZaborona.setChecked(isZaboronaEnabled());
rgDefault.setChecked(!isZaboronaEnabled() && !isRandomProxyEnabled() && !isVikaProxyEnabled());
- rgRandomProxy.setChecked(isRandomProxyEnabled());
+// rgRandomProxy.setChecked(isRandomProxyEnabled());
rgVika.setChecked(isVikaProxyEnabled());
new VkAlertDialog.Builder(ctx)
@@ -153,9 +153,9 @@ public class ProxyHook {
if (rgZaborona.isChecked()) {
Preferences.getPreferences().edit().putString("proxy", "zaborona").commit();
restartApplication();
- } else if (rgRandomProxy.isChecked()) {
- Preferences.getPreferences().edit().putString("proxy", "randomproxy").commit();
- restartApplication();
+// } else if (rgRandomProxy.isChecked()) {
+// Preferences.getPreferences().edit().putString("proxy", "randomproxy").commit();
+// restartApplication();
} else if (rgVika.isChecked()) {
Preferences.getPreferences().edit().putString("proxy", "vika").commit();
restartApplication();
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
index e60925911..7fba9a23d 100644
--- a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
@@ -71,7 +71,8 @@ public class ProxyUtils {
}
public static Boolean isRandomProxyEnabled() {
- return Preferences.getString("proxy").equals("randomproxy");
+// return Preferences.getString("proxy").equals("randomproxy");
+ return false;
}
public static Boolean isApiProxyEnabled() {
@@ -129,11 +130,11 @@ public class ProxyUtils {
return list.contains(":"); // proxy format: ip:port
}
- public static void setProxy() throws IOException {
+ public static void setProxy() {
if (!isAnyProxyEnabled()) return;
switch (Preferences.getString("proxy")) {
case "zaborona" -> Zaborona.loadProxy();
- case "randomproxy" -> RandomProxy.loadProxy();
+// case "randomproxy" -> RandomProxy.loadProxy();
case "socks" -> CustomSocks.loadProxy();
case "http" -> CustomHttp.loadProxy();
case "https" -> CustomHttps.loadProxy();
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
index b60b51135..faf5f6fb7 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
@@ -13,14 +13,14 @@ public class ProxySettingsFragment extends TrackedMaterialPreferenceToolbarFragm
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_proxy);
- findPreference("random_proxy").setOnPreferenceClickListener(preference -> {
- try {
- setupNewProxy();
- } catch (IOException e) {
- sendToast(requireContext().getString(R.string.get_proxy_error));
- }
- return true;
- });
+// findPreference("random_proxy").setOnPreferenceClickListener(preference -> {
+// try {
+// setupNewProxy();
+// } catch (IOException e) {
+// sendToast(requireContext().getString(R.string.get_proxy_error));
+// }
+// return true;
+// });
}
@Override
diff --git a/smali/res/values-be/arrays.xml b/smali/res/values-be/arrays.xml
index 7ab1bf208..1d89c7a8b 100644
--- a/smali/res/values-be/arrays.xml
+++ b/smali/res/values-be/arrays.xml
@@ -604,7 +604,7 @@
- Без проксі
- zaborona.help
- VikaMobile
- - Рандомны проксі
+
- Іншы проксі для API
- Іншы HTTP
- Іншы HTTPS
diff --git a/smali/res/values-ru/arrays.xml b/smali/res/values-ru/arrays.xml
index 4781dfcbd..24c31ef46 100644
--- a/smali/res/values-ru/arrays.xml
+++ b/smali/res/values-ru/arrays.xml
@@ -592,7 +592,7 @@
- Без прокси
- zaborona.help
- VikaMobile
- - Рандомный прокси
+
- Сторонний прокси для API
- Сторонний HTTP
- Сторонний HTTPS
diff --git a/smali/res/values-uk/arrays.xml b/smali/res/values-uk/arrays.xml
index dc4ea26a6..e4161cdce 100644
--- a/smali/res/values-uk/arrays.xml
+++ b/smali/res/values-uk/arrays.xml
@@ -592,7 +592,7 @@
- Без проксі
- zaborona.help
- VikaMobile
- - Випадковий проксі
+
- Сторонній проксі для API
- Сторонній HTTP
- Сторонній HTTPS
diff --git a/smali/res/values/arrays.xml b/smali/res/values/arrays.xml
index f42e06642..18391a052 100644
--- a/smali/res/values/arrays.xml
+++ b/smali/res/values/arrays.xml
@@ -736,7 +736,7 @@
- No proxy
- zaborona.help
- VikaMobile
- - Random proxy
+
- Custom API proxy
- Custom HTTP
- Custom HTTPS
@@ -746,7 +746,7 @@
- noproxy
- zaborona
- vika
- - randomproxy
+
- apiproxy
- http
- https
diff --git a/smali/res/xml/preferences_proxy.xml b/smali/res/xml/preferences_proxy.xml
index e5379922c..06e4a4319 100644
--- a/smali/res/xml/preferences_proxy.xml
+++ b/smali/res/xml/preferences_proxy.xml
@@ -16,10 +16,10 @@
android:entryValues="@array/proxy_value"
android:key="proxy"
android:title="@string/useproxy"/>
-
+
+
+
+