From cc95856e4740604cfcf2caa627942bca993c2c3e Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:11:50 +0300
Subject: [PATCH] Proxy Refactoring

---
 .../java/ru/vtosters/lite/foaf/FoafBase.java  |   4 +-
 .../ru/vtosters/lite/hooks/ProxyHook.java     |  46 -------
 .../java/ru/vtosters/lite/proxy/ApiProxy.java |  50 ++++++++
 .../ru/vtosters/lite/proxy/CustomHttp.java    |  33 +++++
 .../ru/vtosters/lite/proxy/CustomHttps.java   |  33 +++++
 .../ru/vtosters/lite/proxy/CustomSocks.java   |  21 +++
 .../ProxyList.java => proxy/Hookzof.java}     |  34 +++--
 .../ru/vtosters/lite/proxy/RandomProxy.java   |  19 +++
 .../java/ru/vtosters/lite/proxy/Zaborona.java |  10 ++
 .../ru/vtosters/lite/utils/ProxyUtils.java    | 121 +++++-------------
 .../ru/vtosters/lite/utils/SSFSUtils.java     |   4 +-
 .../com/vk/api/base/ApiConfig$a$a$a.smali     |   4 +-
 .../com/vk/api/base/ApiRequest.smali          |   4 +-
 .../com/vk/api/sdk/VKApiConfig$6.smali        |   2 +-
 .../com/vk/api/sdk/auth/VKAuthParams$a.smali  |   2 +-
 .../vk/api/sdk/ui/VKWebViewAuthActivity.smali |   2 +-
 .../attachpicker/u/j/FiltersController.smali  |   2 +-
 .../com/vk/auth/RestoreUtils.smali            |   2 +-
 .../com/vk/auth/VkAuthModel.smali             |   2 +-
 .../com/vk/auth/y/b/UrlCheckFragment$b.smali  |   2 +-
 .../com/vk/balance/BalancePresenter.smali     |   2 +-
 .../common/links/BrowserUtils$Companion.smali |   2 +-
 .../metrics/traffic/TrafficAccumulator.smali  |   2 +-
 .../core/HttpRequestExecutorProvider.smali    |   2 +-
 .../community/CommunityChatsFragment$c.smali  |   2 +-
 .../ui/community/CommunityChatsFragment.smali |   2 +-
 .../com/vk/webapp/VkUiFragment$b.smali        |   2 +-
 .../com/vk/webapp/VkUiFragment.smali          |   4 +-
 .../com/vk/webapp/bridges/AndroidBridge.smali |   4 +-
 .../webapp/bridges/VkUiConnectBridge$a.smali  |   2 +-
 .../vk/webapp/helpers/WebAppApiHelper.smali   |   2 +-
 .../com/vtosters/lite/SDKAuthActivity$d.smali |   2 +-
 .../com/vtosters/lite/SDKAuthActivity.smali   |   4 +-
 .../lite/VKApplication$initNetwork$1.smali    |   2 +-
 .../vtosters/lite/ValidationActivity$a.smali  |   2 +-
 .../vtosters/lite/api/AppVKApiCallback.smali  |   4 +-
 .../money/MoneyWebViewFragment$a.smali        |   2 +-
 .../fragments/n2/DebugDomainsFilter.smali     |   2 +-
 .../fragments/n2/SettingsDebugFragment.smali  |   6 +-
 .../general/fragments/WebViewFragment$a.smali |   4 +-
 .../general/fragments/WebViewFragment.smali   |   4 +-
 ...neProvider$getApiManager$apiConfig$1.smali |   2 +-
 42 files changed, 262 insertions(+), 195 deletions(-)
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/ApiProxy.java
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/CustomHttp.java
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/CustomHttps.java
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/CustomSocks.java
 rename app/src/main/java/ru/vtosters/lite/{utils/ProxyList.java => proxy/Hookzof.java} (66%)
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java
 create mode 100644 app/src/main/java/ru/vtosters/lite/proxy/Zaborona.java

diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
index ea859316b..012787af5 100644
--- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
+++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
@@ -5,7 +5,7 @@ import static android.widget.Toast.makeText;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
+import static ru.vtosters.lite.utils.ProxyUtils.isApiProxyEnabled;
 import static ru.vtosters.lite.utils.ProxyUtils.getApi;
 
 import android.annotation.SuppressLint;
@@ -68,7 +68,7 @@ public class FoafBase {
     private static String getLink(int i) {
         String str;
         StringBuilder sb;
-        if (apiproxy()) {
+        if (isApiProxyEnabled()) {
             sb = new StringBuilder();
             str = "https://" + getApi() + "/_/vk.com/foaf.php?id=";
         } else {
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
index 535f9e588..14a5686f3 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
@@ -2,9 +2,7 @@ package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
 import static ru.vtosters.lite.utils.ProxyUtils.isRandomSocksEnabled;
 import static ru.vtosters.lite.utils.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
@@ -15,7 +13,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.RadioButton;
@@ -98,47 +95,4 @@ public class ProxyHook {
         alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
         alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getAccentColor());
     }
-
-    public static String linkReplacer(String link) {
-        var vkapi = "api.vk.com";
-        var oauth = "oauth.vk.com";
-        var vkstatic = "static.vk.com";
-
-        var proxyapi = getPrefsValue("proxyapi");
-        var proxyoauth = getPrefsValue("proxyoauth");
-        var proxystatic = getPrefsValue("proxystatic");
-
-        if (!apiproxy() || link.isEmpty()) {
-            return link;
-        }
-
-        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
-            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
-            return link;
-        }
-
-        if (link.contains(vkapi)) {
-            return link.replace(proxyapi, vkapi);
-        }
-
-        if (link.contains(oauth)) {
-            return link.replace(proxyoauth, oauth);
-        }
-
-        if (link.contains(vkstatic)) {
-            return link.replace(proxystatic, vkstatic);
-        }
-
-        return link;
-    }
-
-    public static String getAwayPhpCom() {
-        var proxyapi = getPrefsValue("proxyapi");
-
-        if (apiproxy() & !proxyapi.isEmpty()) {
-            return proxyapi;
-        }
-
-        return "m.vk.com";
-    }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/ApiProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/ApiProxy.java
new file mode 100644
index 000000000..9fbc823db
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/ApiProxy.java
@@ -0,0 +1,50 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.ProxyUtils.isApiProxyEnabled;
+
+import android.util.Log;
+
+public class ApiProxy{
+    public static String linkReplacer(String link) {
+        var vkapi = "api.vk.com";
+        var oauth = "oauth.vk.com";
+        var vkstatic = "static.vk.com";
+
+        var proxyapi = getPrefsValue("proxyapi");
+        var proxyoauth = getPrefsValue("proxyoauth");
+        var proxystatic = getPrefsValue("proxystatic");
+
+        if (!isApiProxyEnabled() || link.isEmpty()) {
+            return link;
+        }
+
+        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
+            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
+            return link;
+        }
+
+        if (link.contains(vkapi)) {
+            return link.replace(proxyapi, vkapi);
+        }
+
+        if (link.contains(oauth)) {
+            return link.replace(proxyoauth, oauth);
+        }
+
+        if (link.contains(vkstatic)) {
+            return link.replace(proxystatic, vkstatic);
+        }
+
+        return link;
+    }
+
+    public static String getAwayPhpCom() {
+        var proxyapi = getPrefsValue("proxyapi");
+
+        if (isApiProxyEnabled() & !proxyapi.isEmpty()) {
+            return proxyapi;
+        }
+
+        return "m.vk.com";
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/CustomHttp.java b/app/src/main/java/ru/vtosters/lite/proxy/CustomHttp.java
new file mode 100644
index 000000000..d2a7571c5
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/CustomHttp.java
@@ -0,0 +1,33 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
+
+public class CustomHttp{
+    public static void loadProxy(){
+        System.setProperty("http.proxyHost", proxyHostHTTP());
+        System.setProperty("http.proxyPort", proxyPortHTTP());
+        System.setProperty("http.proxyUser", proxyUserHTTP());
+        System.setProperty("http.proxyPassword", proxyPassHTTP());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostHTTP() {
+        var string = getPrefsValue("proxyHostHTTP");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortHTTP() {
+        var string = getPrefsValue("proxyPortHTTP");
+        return string.isEmpty() ? "8888" : string;
+    }
+
+    private static String proxyUserHTTP() {
+        var string = getPrefsValue("proxyUserHTTP");
+        return string.isEmpty() ? "" : string;
+    }
+
+    private static String proxyPassHTTP() {
+        var string = getPrefsValue("proxyPassHTTP");
+        return string.isEmpty() ? "" : string;
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/CustomHttps.java b/app/src/main/java/ru/vtosters/lite/proxy/CustomHttps.java
new file mode 100644
index 000000000..e162972c5
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/CustomHttps.java
@@ -0,0 +1,33 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
+
+public class CustomHttps{
+    public static void loadProxy(){
+        System.setProperty("https.proxyHost", proxyHostHTTPS());
+        System.setProperty("https.proxyPort", proxyPortHTTPS());
+        System.setProperty("https.proxyUser", proxyUserHTTPS());
+        System.setProperty("https.proxyPassword", proxyPassHTTPS());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostHTTPS() {
+        var string = getPrefsValue("proxyHostHTTPS");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortHTTPS() {
+        var string = getPrefsValue("proxyPortHTTPS");
+        return string.isEmpty() ? "8888" : string;
+    }
+
+    private static String proxyUserHTTPS() {
+        var string = getPrefsValue("proxyUserHTTPS");
+        return string.isEmpty() ? "" : string;
+    }
+
+    private static String proxyPassHTTPS() {
+        String string = getPrefsValue("proxyPassHTTPS");
+        return string.isEmpty() ? "" : string;
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/CustomSocks.java b/app/src/main/java/ru/vtosters/lite/proxy/CustomSocks.java
new file mode 100644
index 000000000..ed8e95b30
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/CustomSocks.java
@@ -0,0 +1,21 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
+
+public class CustomSocks{
+    public static void loadProxy(){
+        System.setProperty("socksProxyHost", proxyHostSocks());
+        System.setProperty("socksProxyPort", proxyPortSocks());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostSocks() {
+        var string = getPrefsValue("proxyHostSocks");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortSocks() {
+        var string = getPrefsValue("proxyPortSocks");
+        return string.isEmpty() ? "8888" : string;
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/utils/ProxyList.java b/app/src/main/java/ru/vtosters/lite/proxy/Hookzof.java
similarity index 66%
rename from app/src/main/java/ru/vtosters/lite/utils/ProxyList.java
rename to app/src/main/java/ru/vtosters/lite/proxy/Hookzof.java
index 4007bf228..6b42e559f 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/ProxyList.java
+++ b/app/src/main/java/ru/vtosters/lite/proxy/Hookzof.java
@@ -1,11 +1,9 @@
-package ru.vtosters.lite.utils;
+package ru.vtosters.lite.proxy;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.ProxyUtils.setProxyRefl;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
 
 import android.util.Log;
 
-import org.json.JSONException;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,7 +14,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class ProxyList{
+public class Hookzof{
     private static final OkHttpClient mClient = new OkHttpClient();
 
     public static void loadProxy() {
@@ -27,52 +25,52 @@ public class ProxyList{
         mClient.a(link).a(new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("ProxyList", "Error while getting proxy: " + e);
+                Log.d("Hookzof", "Error while getting proxy: " + e);
                 loadError();
             }
 
             @Override
-            public void a(Call call, Response response) throws IOException {
+            public void a(Call call, Response response){
                 try {
                     setData(response);
-                } catch (JSONException | NullPointerException e) {
+                } catch (NullPointerException | IOException e) {
                     e.printStackTrace();
                 }
             }
         });
     }
 
-    static void loadError() {
-        sendToast("Error while getting proxy");
-    }
-
-    static void setData(Response response) throws IOException, JSONException {
+    static void setData(Response response) throws IOException{
         String resp = response.a().g();
 
         if (!hasProxy(resp)) {
-            Log.d("ProxyList", "No proxy found");
+            Log.d("Hookzof", "No proxy found");
             return;
         }
 
         ArrayList<String> proxyList = new ArrayList<>(Arrays.asList(resp.split("\n")));
 
-        Log.d("ProxyList", proxyList.toString());
+        Log.d("Hookzof", proxyList.toString());
 
         String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
 
         if (!hasProxy(proxy)) {
-            Log.d("ProxyList", "No proxy port found");
+            Log.d("Hookzof", "No proxy port found");
             return;
         }
 
-        Log.d("ProxyList", "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+        Log.d("Hookzof", "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
 
         System.setProperty("socksProxyHost", proxy.split(":")[0]);
         System.setProperty("socksProxyPort", proxy.split(":")[1]);
-        setProxyRefl();
+        forceProxyApplying();
     }
 
     static boolean hasProxy(String list) {
         return list.contains(":"); // proxy format: ip:port
     }
+
+    static void loadError() {
+        sendToast("Error while getting proxy Hookzof");
+    }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java
new file mode 100644
index 000000000..01d63dc26
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java
@@ -0,0 +1,19 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
+
+public class RandomProxy{
+    public static void loadProxy(){
+        var random = new java.util.Random();
+        var randomInt = random.nextInt(2);
+        switch (randomInt){ // TODO make more services
+            case 0:
+                Hookzof.loadProxy();
+                break;
+            case 1:
+                System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
+                System.setProperty("socksProxyPort", "1488");
+                forceProxyApplying();
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/Zaborona.java b/app/src/main/java/ru/vtosters/lite/proxy/Zaborona.java
new file mode 100644
index 000000000..e0e3288db
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/proxy/Zaborona.java
@@ -0,0 +1,10 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.utils.ProxyUtils.forceProxyApplying;
+
+public class Zaborona{
+    public static void loadProxy(){
+        System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
+        System.setProperty("socksProxyPort", "1488");
+        forceProxyApplying();
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/utils/ProxyUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ProxyUtils.java
index d2af44624..2dd682ae6 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/ProxyUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/ProxyUtils.java
@@ -1,6 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static java.lang.System.clearProperty;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 
@@ -13,11 +14,18 @@ import android.util.Log;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+import ru.vtosters.lite.proxy.CustomHttp;
+import ru.vtosters.lite.proxy.CustomHttps;
+import ru.vtosters.lite.proxy.CustomSocks;
+import ru.vtosters.lite.proxy.Hookzof;
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.proxy.Zaborona;
+
 public class ProxyUtils {
     public static String getApi() {
         var proxyapi = getPrefsValue("proxyapi");
 
-        if (apiproxy() & !proxyapi.isEmpty()) {
+        if (isApiProxyEnabled() & !proxyapi.isEmpty()) {
             return proxyapi;
         }
 
@@ -32,7 +40,11 @@ public class ProxyUtils {
         return getPrefsValue("proxy").equals("randomsocks");
     }
 
-    public static void setProxyRefl() {
+    public static Boolean isApiProxyEnabled() {
+        return getPrefsValue("proxy").equals("apiproxy");
+    }
+
+    public static void forceProxyApplying() {
         Log.d("Proxy", "Setting proxy...");
         try {
             var context = getGlobalContext().getApplicationContext();
@@ -47,20 +59,22 @@ public class ProxyUtils {
             @SuppressLint("DiscouragedPrivateApi") Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
             mReceiversField.setAccessible(true);
             ArrayMap<?, ?> receivers = (ArrayMap<?, ?>) mReceiversField.get(mLoadedApkObject);
-            for (Object receiverMap : receivers.values()) {
-                for (Object receiver : ((ArrayMap<?, ?>) receiverMap).keySet()) {
-                    Class<?> receiverClass = receiver.getClass();
+            if (receivers != null) {
+                for (Object receiverMap : receivers.values()) {
+                    for (Object receiver : ((ArrayMap<?, ?>) receiverMap).keySet()) {
+                        Class<?> receiverClass = receiver.getClass();
 
-                    if (receiverClass.getName().contains("ProxyChangeListener")) {
-                        Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
-                        Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
-                        onReceiveMethod.invoke(receiver, context, intent);
-                    } else {
-                        for (Field field : receiverClass.getDeclaredFields()) {
-                            if (field.getType().getName().contains("ProxyChangeListener")) {
-                                Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
-                                Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
-                                onReceiveMethod.invoke(receiver, context, intent);
+                        if (receiverClass.getName().contains("ProxyChangeListener")) {
+                            Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+                            Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
+                            onReceiveMethod.invoke(receiver, context, intent);
+                        } else {
+                            for (Field field : receiverClass.getDeclaredFields()) {
+                                if (field.getType().getName().contains("ProxyChangeListener")) {
+                                    Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+                                    Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
+                                    onReceiveMethod.invoke(receiver, context, intent);
+                                }
                             }
                         }
                     }
@@ -76,31 +90,19 @@ public class ProxyUtils {
     public static void setProxy() {
         switch (getPrefsValue("proxy")) {
             case "zaborona":
-                System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
-                System.setProperty("socksProxyPort", "1488");
-                setProxyRefl();
+                Zaborona.loadProxy();
                 break;
             case "randomsocks":
-                ProxyList.loadProxy();
+                RandomProxy.loadProxy();
                 break;
             case "socks":
-                System.setProperty("socksProxyHost", proxyHostSocks());
-                System.setProperty("socksProxyPort", proxyPortSocks());
-                setProxyRefl();
+                CustomSocks.loadProxy();
                 break;
             case "http":
-                System.setProperty("http.proxyHost", proxyHostHTTP());
-                System.setProperty("http.proxyPort", proxyPortHTTP());
-                System.setProperty("http.proxyUser", proxyUserHTTP());
-                System.setProperty("http.proxyPassword", proxyPassHTTP());
-                setProxyRefl();
+                CustomHttp.loadProxy();
                 break;
             case "https":
-                System.setProperty("https.proxyHost", proxyHostHTTPS());
-                System.setProperty("https.proxyPort", proxyPortHTTPS());
-                System.setProperty("https.proxyUser", proxyUserHTTPS());
-                System.setProperty("https.proxyPassword", proxyPassHTTPS());
-                setProxyRefl();
+                CustomHttps.loadProxy();
                 break;
             default:
                 resetProxy();
@@ -119,59 +121,6 @@ public class ProxyUtils {
         clearProperty("http.proxyPassword");
         clearProperty("socksProxyHost");
         clearProperty("socksPortHost");
+        edit().putString("proxy", "noproxy").commit();
     } // Reset all proxies
-
-    private static String proxyHostHTTP() {
-        var string = getPrefsValue("proxyHostHTTP");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyHostHTTPS() {
-        var string = getPrefsValue("proxyHostHTTPS");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyHostSocks() {
-        var string = getPrefsValue("proxyHostSocks");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyPortHTTP() {
-        var string = getPrefsValue("proxyPortHTTP");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyPortHTTPS() {
-        var string = getPrefsValue("proxyPortHTTPS");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyPortSocks() {
-        var string = getPrefsValue("proxyPortSocks");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyUserHTTP() {
-        var string = getPrefsValue("proxyUserHTTP");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyUserHTTPS() {
-        var string = getPrefsValue("proxyUserHTTPS");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyPassHTTP() {
-        var string = getPrefsValue("proxyPassHTTP");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyPassHTTPS() {
-        String string = getPrefsValue("proxyPassHTTPS");
-        return string.isEmpty() ? "" : string;
-    }
-
-    public static boolean apiproxy() {
-        return getPrefsValue("proxy").equals("apiproxy");
-    }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java b/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java
index aa6973966..1439d5709 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java
@@ -5,7 +5,7 @@ import static ru.vtosters.lite.utils.About.getBuildNumber;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.vksans;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
+import static ru.vtosters.lite.utils.ProxyUtils.isApiProxyEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 
 public class SSFSUtils {
@@ -39,7 +39,7 @@ public class SSFSUtils {
     }
 
     public static String getUserProxy() {
-        return apiproxy() ? "1" : "0";
+        return isApiProxyEnabled() ? "1" : "0";
     }
 
     public static String isVKSansEnabled() {
diff --git a/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali b/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali
index 64df05ebd..43b752dd0 100644
--- a/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali
+++ b/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali
@@ -103,7 +103,7 @@
 
     const-string v0, "api.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -123,7 +123,7 @@
 
     const-string v0, "api.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali
index 2843e024c..3f4de987d 100644
--- a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali
+++ b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali
@@ -1258,7 +1258,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1267,7 +1267,7 @@
     :cond_0
     const-string v0, "api.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali
index 866aa4178..e3d3254dc 100644
--- a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali
+++ b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali
@@ -71,7 +71,7 @@
 
     const-string v0, "api.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali b/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali
index 66da43a0d..defde3d19 100644
--- a/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali
+++ b/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali
@@ -114,7 +114,7 @@
 
     const-string v3, "https://oauth.vk.com/blank.html"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali
index 176b8f987..f0722119c 100644
--- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali
+++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali
@@ -202,7 +202,7 @@
     :cond_0
     const-string v0, "https://oauth.vk.com/authorize"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali
index de38f6314..125f7a049 100644
--- a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali
+++ b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali
@@ -21,7 +21,7 @@
 
     const-string v1, "{\"response\":{\"catalog_version\":11,\"filters\":{\"count\":9,\"items\":[{\"id\":\"snow\",\"app_version\":\"v2.0.0(14077)\",\"preset\":{\"col\":[{\"lumAdj\":0.036000,\"satAdj\":0.145000,\"sm\":0.350000,\"fG\":0.500000,\"fB\":0.500000,\"thr\":0.350000,\"fR\":0.500000,\"hue\":0},{\"lumAdj\":0.099000,\"satAdj\":0,\"sm\":0.350000,\"fG\":1,\"fB\":1,\"thr\":0.034000,\"fR\":1,\"hue\":0.567000},{\"lumAdj\":0.061000,\"satAdj\":0.860000,\"sm\":0.224000,\"fG\":0.451000,\"fB\":0.451000,\"thr\":0.069000,\"fR\":1,\"hue\":0.057000},{\"lumAdj\":0,\"satAdj\":0.224000,\"sm\":0.111000,\"fG\":0,\"fB\":0,\"thr\":0.051000,\"fR\":0.702000,\"hue\":0.018000},{\"lumAdj\":-0.038000,\"satAdj\":0.136000,\"sm\":0.332000,\"fG\":0,\"fB\":0,\"thr\":0.177000,\"fR\":1,\"hue\":0.018000},{\"lumAdj\":0.111000,\"satAdj\":0.864000,\"sm\":0.348000,\"fG\":1,\"fB\":1,\"thr\":0.071000,\"fR\":0,\"hue\":0.572000},{\"lumAdj\":-0.069000,\"satAdj\":0.178000,\"sm\":0.068000,\"fG\":0,\"fB\":0,\"thr\":0,\"fR\":0,\"hue\":0.949000}],\"red_curve\":[0,64,128,192,255],\"sat\":-0.025000,\"con\":-0.299000,\"green_curve\":[0,64,128,192,255],\"blue_curve\":[0,64,128,192,255],\"rgb_curve\":[0,57,132,194,255],\"br\":-0.102000,\"enh\":0.399000,\"tint\":-0.138000},\"name\":\"Snow\",\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/snow@2x.jpg?3\"},{\"id\":\"lake\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.018145,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.441830,\"lumAdj\":-0.095000,\"satAdj\":0.311000,\"sm\":0.264000,\"thr\":0.185000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.021000,\"satAdj\":0.000000,\"sm\":0.350000,\"thr\":0.409000},{\"fB\":0.176000,\"fG\":0.192000,\"fR\":0.243000,\"hue\":0.662092,\"lumAdj\":-0.003000,\"satAdj\":0.122984,\"sm\":0.146000,\"thr\":0.026000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":0.418954,\"lumAdj\":-0.035685,\"satAdj\":-0.012097,\"sm\":0.311000,\"thr\":0.120000},{\"fB\":0.600000,\"fG\":1.000000,\"fR\":0.992000,\"hue\":0.170000,\"lumAdj\":0.023000,\"satAdj\":-0.347000,\"sm\":0.271000,\"thr\":0.130000},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":0.022000,\"lumAdj\":0.021000,\"satAdj\":0.250000,\"sm\":0.255000,\"thr\":0.087000},{\"fB\":0.424000,\"fG\":0.525000,\"fR\":0.765000,\"hue\":0.069935,\"lumAdj\":0.040524,\"satAdj\":-0.177419,\"sm\":0.129486,\"thr\":0.038199},{\"fB\":0.188000,\"fG\":0.220000,\"fR\":0.329000,\"hue\":0.037000,\"lumAdj\":-0.016000,\"satAdj\":0.333000,\"sm\":0.097000,\"thr\":0.006000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.350980,\"lumAdj\":0.061000,\"satAdj\":0.052000,\"sm\":0.319000,\"thr\":0.009000}],\"con\":0.119000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,71,134,192,255],\"sat\":0.370968,\"shar\":0.000000,\"tem\":-0.415000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Lake\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/lake@2x.jpg?3\"},{\"id\":\"dew\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.505000,\"lumAdj\":-0.041000,\"satAdj\":0.089000,\"sm\":0.194000,\"thr\":0.039000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.108000,\"lumAdj\":-0.031000,\"satAdj\":-0.084000,\"sm\":0.350000,\"thr\":0.096000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.071895,\"lumAdj\":-0.031000,\"satAdj\":0.038000,\"sm\":0.172000,\"thr\":0.243000},{\"fB\":0.000000,\"fG\":0.549000,\"fR\":0.012000,\"hue\":0.506000,\"lumAdj\":-0.096000,\"satAdj\":1.000000,\"sm\":0.204000,\"thr\":0.096000},{\"fB\":0.451000,\"fG\":0.427000,\"fR\":0.467000,\"hue\":0.900000,\"lumAdj\":0.000000,\"satAdj\":0.190000,\"sm\":0.030000,\"thr\":0.000000},{\"fB\":0.431000,\"fG\":0.420000,\"fR\":0.392000,\"hue\":0.550000,\"lumAdj\":0.000000,\"satAdj\":0.482000,\"sm\":0.077000,\"thr\":0.002000},{\"fB\":0.780000,\"fG\":0.792000,\"fR\":0.745000,\"hue\":0.542000,\"lumAdj\":0.000000,\"satAdj\":-1.000000,\"sm\":0.297000,\"thr\":0.003000},{\"fB\":0.200000,\"fG\":0.200000,\"fR\":0.200000,\"hue\":0.966013,\"lumAdj\":-0.029032,\"satAdj\":0.098790,\"sm\":0.350000,\"thr\":0.023000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.837908,\"lumAdj\":-0.001000,\"satAdj\":0.216000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":1.000000,\"fG\":0.835000,\"fR\":0.690000,\"hue\":0.480000,\"lumAdj\":-0.110000,\"satAdj\":0.201000,\"sm\":0.086000,\"thr\":0.002000},{\"fB\":0.490000,\"fG\":0.659000,\"fR\":0.698000,\"hue\":0.022000,\"lumAdj\":-0.002000,\"satAdj\":0.318000,\"sm\":0.307000,\"thr\":0.028000},{\"fB\":0.478000,\"fG\":0.592000,\"fR\":0.835000,\"hue\":0.053000,\"lumAdj\":0.108000,\"satAdj\":0.333000,\"sm\":0.221000,\"thr\":0.004000},{\"fB\":0.886000,\"fG\":0.612000,\"fR\":0.380000,\"hue\":0.476000,\"lumAdj\":-0.052000,\"satAdj\":0.571000,\"sm\":0.155000,\"thr\":0.010000}],\"con\":0.000000,\"localCurrentColor\":8,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.007000},\"isDisabled\":false,\"name\":\"Dew\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dew@2x.jpg?3\"},{\"id\":\"ash\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.027000,\"satAdj\":-0.636000,\"sm\":0.348000,\"thr\":0.018000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.032026,\"lumAdj\":-0.041129,\"satAdj\":0.100806,\"sm\":0.348000,\"thr\":0.138000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.167320,\"lumAdj\":-0.062298,\"satAdj\":0.062500,\"sm\":0.256000,\"thr\":0.000000},{\"fB\":0.561000,\"fG\":0.651000,\"fR\":0.745000,\"hue\":0.104000,\"lumAdj\":-0.025000,\"satAdj\":0.309000,\"sm\":0.092000,\"thr\":0.019000},{\"fB\":0.149000,\"fG\":0.149000,\"fR\":0.149000,\"hue\":0.986000,\"lumAdj\":-0.043000,\"satAdj\":0.206000,\"sm\":0.188000,\"thr\":0.008000},{\"fB\":0.961000,\"fG\":0.631000,\"fR\":0.412000,\"hue\":0.535294,\"lumAdj\":0.000000,\"satAdj\":0.989919,\"sm\":0.202000,\"thr\":0.000000}],\"con\":0.000000,\"localCurrentColor\":5,\"enh\":0.179000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Ash\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/ash@2x.jpg?3\"},{\"id\":\"fen\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.058000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.044000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.032000,\"satAdj\":0.000000,\"sm\":0.344000,\"thr\":0.358000},{\"fB\":0.176000,\"fG\":0.196000,\"fR\":0.294000,\"hue\":0.030065,\"lumAdj\":-0.019000,\"satAdj\":0.336000,\"sm\":0.037000,\"thr\":0.000000},{\"fB\":0.200000,\"fG\":0.216000,\"fR\":0.235000,\"hue\":0.601307,\"lumAdj\":-0.047177,\"satAdj\":0.133065,\"sm\":0.095000,\"thr\":0.006000},{\"fB\":0.780000,\"fG\":0.471000,\"fR\":0.329000,\"hue\":0.437255,\"lumAdj\":0.000000,\"satAdj\":0.344758,\"sm\":0.150000,\"thr\":0.031000}],\"con\":-0.516000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.163000,\"gr\":0.000000,\"green_curve\":[0,65,124,192,255],\"red_curve\":[0,65,126,192,255],\"rgb_curve\":[0,42,119,185,249],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Fen\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/fen@2x.jpg?3\"},{\"id\":\"drama\",\"date\":0,\"preset\":{\"blue_curve\":[0,62,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.153000,\"fG\":0.180000,\"fR\":0.337000,\"hue\":0.025000,\"lumAdj\":0.000000,\"satAdj\":0.284000,\"sm\":0.103000,\"thr\":0.021000},{\"fB\":0.537000,\"fG\":0.565000,\"fR\":0.804000,\"hue\":0.016993,\"lumAdj\":0.037500,\"satAdj\":0.161290,\"sm\":0.108000,\"thr\":0.010000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.031452,\"satAdj\":0.800403,\"sm\":0.338004,\"thr\":0.038588},{\"fB\":0.549000,\"fG\":0.631000,\"fR\":0.824000,\"hue\":1.000000,\"lumAdj\":0.058669,\"satAdj\":0.175403,\"sm\":0.155000,\"thr\":0.035000},{\"fB\":0.270588,\"fG\":0.270588,\"fR\":0.325490,\"hue\":1.000000,\"lumAdj\":0.059879,\"satAdj\":0.008065,\"sm\":0.083266,\"thr\":0.008340}],\"con\":0.054435,\"localCurrentColor\":6,\"enh\":0.163306,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,60,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,49,118,196,255],\"sat\":-0.514113,\"shar\":0.000000,\"tem\":-0.328000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Drama\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/drama@2x.jpg?3\"},{\"id\":\"sunset\",\"date\":1457719798,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.004032,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.533000,\"lumAdj\":-0.177000,\"satAdj\":-0.234000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.570000,\"lumAdj\":-0.052000,\"satAdj\":0.201000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.596078,\"lumAdj\":0.000000,\"satAdj\":0.252000,\"sm\":0.203000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.400000,\"hue\":0.985000,\"lumAdj\":-0.069000,\"satAdj\":0.276000,\"sm\":0.100000,\"thr\":0.057000},{\"fB\":0.400000,\"fG\":0.000000,\"fR\":0.008000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.108871,\"sm\":0.150000,\"thr\":0.100000},{\"fB\":0.043000,\"fG\":0.090000,\"fR\":0.153000,\"hue\":0.041000,\"lumAdj\":-0.036000,\"satAdj\":0.327000,\"sm\":0.059000,\"thr\":0.000000},{\"fB\":0.945000,\"fG\":0.961000,\"fR\":0.961000,\"hue\":0.580000,\"lumAdj\":0.119000,\"satAdj\":0.584000,\"sm\":0.114000,\"thr\":0.000000},{\"fB\":0.333000,\"fG\":0.506000,\"fR\":0.725000,\"hue\":0.083000,\"lumAdj\":0.018000,\"satAdj\":0.679000,\"sm\":0.173000,\"thr\":0.067000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":1.000000,\"lumAdj\":-0.059000,\"satAdj\":0.163000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.619000,\"lumAdj\":-0.013000,\"satAdj\":0.000000,\"sm\":0.177000,\"thr\":0.053000}],\"con\":0.268145,\"localCurrentColor\":3,\"enh\":0.157258,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-0.155000,\"shar\":0.250000,\"tem\":-0.488510,\"tint\":-0.186000,\"vig\":0.293000},\"isDisabled\":false,\"name\":\"Sunset\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/sunset@2x.jpg?3\"},{\"id\":\"downpour\",\"date\":1457719647,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.560131,\"lumAdj\":-0.047177,\"satAdj\":0.107000,\"sm\":0.157000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.026797,\"lumAdj\":-0.034476,\"satAdj\":0.320564,\"sm\":0.200000,\"thr\":0.243000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.466013,\"lumAdj\":-0.020565,\"satAdj\":0.092742,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.247000,\"fG\":0.416000,\"fR\":0.580000,\"hue\":0.090196,\"lumAdj\":-0.035081,\"satAdj\":0.391129,\"sm\":0.186290,\"thr\":0.008739},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.549020,\"lumAdj\":-0.032661,\"satAdj\":0.252000,\"sm\":0.233216,\"thr\":0.003378},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.532680,\"lumAdj\":0.000000,\"satAdj\":-0.285000,\"sm\":0.200000,\"thr\":0.038000},{\"fB\":0.137255,\"fG\":0.133333,\"fR\":0.105882,\"hue\":1.000000,\"lumAdj\":-0.053831,\"satAdj\":0.308468,\"sm\":0.185585,\"thr\":0.000624},{\"fB\":0.470588,\"fG\":0.529412,\"fR\":0.639216,\"hue\":0.058170,\"lumAdj\":0.095565,\"satAdj\":0.118952,\"sm\":0.221573,\"thr\":0.018977}],\"con\":-0.143145,\"localCurrentColor\":8,\"enh\":0.146169,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,62,141,205,255],\"sat\":-0.348790,\"shar\":0.232000,\"tem\":-0.314516,\"tint\":-0.135000,\"vig\":0.008000},\"isDisabled\":false,\"name\":\"Downpour\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/downpour@2x.jpg?3\"},{\"id\":\"dark\",\"date\":1457715727,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":-0.107500,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.211694,\"satAdj\":-0.629032,\"sm\":0.349647,\"thr\":0.761176},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.549000,\"hue\":1.000000,\"lumAdj\":0.168750,\"satAdj\":0.000000,\"sm\":0.325302,\"thr\":0.814856},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.091000,\"satAdj\":0.000000,\"sm\":0.163000,\"thr\":0.129000},{\"fB\":0.914000,\"fG\":0.761000,\"fR\":0.612000,\"hue\":0.584000,\"lumAdj\":-0.121000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.102000,\"fG\":0.102000,\"fR\":0.102000,\"hue\":1.000000,\"lumAdj\":0.052000,\"satAdj\":0.000000,\"sm\":0.287000,\"thr\":0.000000},{\"fB\":0.647059,\"fG\":0.745098,\"fR\":0.968627,\"hue\":0.050980,\"lumAdj\":0.137903,\"satAdj\":0.000000,\"sm\":0.340474,\"thr\":0.156163}],\"con\":0.295000,\"localCurrentColor\":7,\"enh\":0.212000,\"fade\":0.028000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-1.000000,\"shar\":0.240000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Dark\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dark@2x.jpg?3\"}]},\"instagram_suffix\":\"\",\"instagram_fallback\":0}}"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali
index a8fc02642..5e230d8f3 100644
--- a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali
+++ b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali
@@ -47,7 +47,7 @@
 
     const-string v1, "static.vk.com/restore"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali
index dbeca25f7..bedb5ca4a 100644
--- a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali
+++ b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali
@@ -657,7 +657,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali b/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali
index 4e2dca9ef..42905e138 100644
--- a/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali
+++ b/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali
@@ -56,7 +56,7 @@
 
     const-string v0, "oauth.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali
index 5baa638a4..bf57277ce 100644
--- a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali
+++ b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali
@@ -166,7 +166,7 @@
 
     const-string v2, "https://static.vk.com/promo_codes/"
 
-    invoke-static {v2}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
diff --git a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali b/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali
index 15b6c36e3..b1cc7ccd4 100644
--- a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali
+++ b/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali
@@ -640,7 +640,7 @@
     const-string v0, ""
 
     :goto_0
-    invoke-static {}, Lru/vtosters/lite/hooks/ProxyHook;->getAwayPhpCom()Ljava/lang/String;
+    invoke-static {}, Lru/vtosters/lite/proxy/ApiProxy;->getAwayPhpCom()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali b/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali
index d876d288d..b7e5074e4 100644
--- a/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali
+++ b/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali
@@ -187,7 +187,7 @@
 
     const-string v3, "https://api.vk.com/method/execute"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali
index 369239d07..610d45bd7 100644
--- a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali
+++ b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali
@@ -275,7 +275,7 @@
 
     const-string v3, "api.vk.com"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali
index 8a9047afd..37b095411 100644
--- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali
+++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali
@@ -56,7 +56,7 @@
 
     const-string v4, "static.vk.com"
 
-    invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali
index e3df62f13..69d465cc2 100644
--- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali
+++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali
@@ -84,7 +84,7 @@
 
     const-string v4, "static.vk.com"
 
-    invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali
index 73b52c6da..fa56baf69 100644
--- a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali
+++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali
@@ -132,7 +132,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali
index 01014db67..4564ba191 100644
--- a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali
+++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali
@@ -1217,7 +1217,7 @@
 
     const-string v3, "static.vk.com"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -1968,7 +1968,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali b/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali
index 0974269fa..cb90a61ea 100644
--- a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali
+++ b/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali
@@ -1491,7 +1491,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1585,7 +1585,7 @@
 
     const-string p3, "https://oauth.vk.com/authorize"
 
-    invoke-static {p3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
diff --git a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali
index 9decc0b58..18c100eca 100644
--- a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali
+++ b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali
@@ -240,7 +240,7 @@
 
     move-result-object p3
 
-    invoke-static {p3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali
index d522bc7c3..f53718e6b 100644
--- a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali
+++ b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali
@@ -182,7 +182,7 @@
 
     .line 16
     :goto_0
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali
index 162c44c2b..2cfd6b2db 100644
--- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali
+++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali
@@ -97,7 +97,7 @@
 
     const-string v4, "oauth.vk.com"
 
-    invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali
index 4f9ecb3cb..e299ba94c 100644
--- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali
+++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali
@@ -207,7 +207,7 @@
 
     const-string v4, "https://oauth.vk.com/blank.html"
 
-    invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -296,7 +296,7 @@
 
     const-string v1, "oauth.vk.com"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali
index fa33c5ac1..ba521d59f 100644
--- a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali
+++ b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali
@@ -82,7 +82,7 @@
 
     .line 3
     :goto_0
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali
index d19aa5770..cb9565c23 100644
--- a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali
+++ b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali
@@ -326,7 +326,7 @@
 
     const-string v3, "oauth.vk.com"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali
index d39e6e157..42c541e00 100644
--- a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali
+++ b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali
@@ -208,7 +208,7 @@
 
     const-string v0, "api.vk.com"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -305,7 +305,7 @@
 
     const-string v3, "api.vk.com"
 
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali
index 66584e173..b8ca98204 100644
--- a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali
+++ b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali
@@ -68,7 +68,7 @@
 
     const-string v1, "oauth.vk.com"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali
index bfa41bc28..919811e4b 100644
--- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali
+++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali
@@ -305,7 +305,7 @@
     :goto_5
     const-string p2, "api.vk.com"
 
-    invoke-static {p2}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali
index c6c9b5fc2..388da5221 100644
--- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali
+++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali
@@ -1986,7 +1986,7 @@
 
     const-string v1, "static.vk.com"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2004,7 +2004,7 @@
 
     const-string v2, "previous_oauth"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2018,7 +2018,7 @@
 
     const-string v1, "api.vk.com"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali
index dac7985b7..386436a9d 100644
--- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali
+++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali
@@ -40,7 +40,7 @@
 
     const-string v1, "oauth.vk.com"
 
-    invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -182,7 +182,7 @@
 
     const-string v0, "https://oauth.vk.com/blank.html#state=webview_refresh_access_token"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali
index d405868a8..d33b33aec 100644
--- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali
+++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali
@@ -1012,7 +1012,7 @@
 
     const-string v2, "https://oauth.vk.com/webview_token"
 
-    invoke-static {v2}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1202,7 +1202,7 @@
 
     const-string v0, "https://oauth.vk.com/webview_token"
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali
index fd0ace6cd..c6304350b 100644
--- a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali
+++ b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lru/vtosters/lite/proxy/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0