Merge remote-tracking branch 'origin/vtl-remaster' into vtl-remaster

app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java

@@ -1,8 +1,8 @@
 package ru.vtosters.lite.dnr;
 
 import static ru.vtosters.lite.net.Request.makeRequest;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getUserToken;
-import static ru.vtosters.lite.utils.Proxy.getApiCom;
 
 import com.vk.core.util.ToastUtils;
 import com.vk.im.engine.commands.messages.SetUserActivityCmd;
@@ -51,7 +51,7 @@ public class DNRModule{
     }
 
     public static void hookRead(Dialog dialog){
-        makeRequest("https://" + getApiCom() + "/method/messages.markAsRead?start_message_id=" + dialog.F1() + "&peer_id=" + dialog.getId() + "&v=5.91&access_token=" + getUserToken(), response -> {
+        makeRequest("https://" + getPrefsValue("proxyapi") + "/method/messages.markAsRead?start_message_id=" + dialog.F1() + "&peer_id=" + dialog.getId() + "&v=5.91&access_token=" + getUserToken(), response -> {
             ToastUtils.a("Чат помечен как прочитанный!");
         });
     }

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -3,8 +3,8 @@ package ru.vtosters.lite.foaf;
 import static android.widget.Toast.LENGTH_SHORT;
 import static android.widget.Toast.makeText;
 import static ru.vtosters.lite.utils.Globals.getIdentifier;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getString;
-import static ru.vtosters.lite.utils.Proxy.getApiCom;
 import static ru.vtosters.lite.utils.Proxy.proxy;
 
 import android.app.ProgressDialog;
@@ -52,7 +52,7 @@ public class FoafBase{
         StringBuilder sb;
         if(proxy()){
             sb = new StringBuilder();
-            str = "https://" + getApiCom() + "/_/vk.com/foaf.php?id=";
+            str = "https://" + getPrefsValue("proxyapi") + "/_/vk.com/foaf.php?id=";
         } else {
             sb = new StringBuilder();
             str = "https://vk.com/foaf.php?id=";

app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java

@@ -48,9 +48,11 @@ import java.util.List;
 
 public class Newsfeed{
     public static List<String> mFilters;
+    public static List<String> mFiltersLinks;
 
     public static void setupFilters(){
         mFilters = new ArrayList();
+        mFiltersLinks = new ArrayList();
 
         getFilter("refsfilter", "Referals.txt");
         getFilter("shortlinkfilter", "LinkShorter.txt");
@@ -63,6 +65,11 @@ public class Newsfeed{
             mFilters.addAll(Arrays.asList(customfilters.split(", ")));
         }
 
+        String linkfilter = getPrefsValue("linkfilter");
+
+        if(!linkfilter.isEmpty()){
+            mFiltersLinks.addAll(Arrays.asList(linkfilter.split(", ")));
+        }
     }
 
     public static void getFilter(String boolname, String filename){
@@ -98,32 +105,32 @@ public class Newsfeed{
             return false;
         }
 
-        checkCopyright(obj);
+        if(checkCopyright(obj)) return false;
+
+        if(isBadNew(obj.optString("text", ""))) return false;
 
-        optString = obj.optString("text", "");
-        if(isBadNew(optString)) return false;
         if(checkCaption(obj)) return false;
 
         return !isGroupAds(obj);
     }
 
     private static boolean checkCopyright(JSONObject json) throws JSONException{
+        String linkfilter = getPrefsValue("linkfilter");
+
         if(json.opt("copyright") != null){
             JSONObject copyright = json.getJSONObject("copyright");
             String copyrightlink = copyright.getString("link");
 
-            return !copyrightlink.contains("vk.com") || !copyright_post(); // fuck you, it doesn't work to detect link value
+            for(String linkfilters : mFiltersLinks) {
+                if(copyrightlink.toLowerCase().contains(linkfilters.toLowerCase())){
+                    return true;
+                }
+            }
 
-            // example of response
+            return copyright_post();
-            //"copyright": {
-            //"id": 251706814,
-            //"link": "https://vk.com/wall251706814_9016",
-            //"type": "owner",
-            //"name": "Маргарита Буруня"
-            //}
 
         }
-        return true;
+        return false;
     }
 
     private static boolean isRecomsGroup(String src){

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -289,10 +289,6 @@ public class Preferences{
         return dnr() ? "messages.markAsRead" : "null";
     }
 
-    public static String copyrightfix(){
-        return copyright_post() ? "copyright" : "ads_easy_promote";
-    }
-
     public static boolean refsfilter(){
         return getBoolValue("refsfilter", false);
     }

app/src/main/java/ru/vtosters/lite/utils/Proxy.java

@@ -5,69 +5,52 @@ import static java.lang.System.getProperties;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 
+import android.util.Log;
+
 import java.util.Properties;
 
 public class Proxy{
-    public static String getOauthComAuth(){
+    public static String linkReplacer(String link){
-        return getOauthComHttps() + "/authorize";
+        String vkapi = "api.vk.com";
-    }
+        String oauth = "oauth.vk.com";
+        String vkstatic = "static.vk.com";
 
-    public static String getOauthComAuthClient(){
+        String proxproxyapi = getPrefsValue("proxyapi");
-        return getOauthComAuth() + "?client_id=";
+        String proxyoauth = getPrefsValue("proxyoauth");
-    }
+        String proxystatic = getPrefsValue("proxystatic");
 
-    public static String getOauthComBlank(){
+        if(!proxy() || link.isEmpty()){
-        return getOauthComHttps() + "/blank.html";
+            return link;
-    }
+        }
 
-    public static String getOauthComBlankRedirect(){
+        if(proxproxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()){
-        return "&redirect_uri=" + getOauthComBlank();
+            Log.d("VTLite", "Proxy is not set" + " " + proxproxyapi + " " + proxyoauth + " " + proxystatic);
-    }
+            return link;
+        }
 
-    public static String getOauthComHttps(){
+        if(link.contains(vkapi)){
-        return "https://" + getOauthCom();
+            return link.replace(proxproxyapi, vkapi);
-    }
+        }
 
-    public static String getStaticComSupport(){
+        if(link.contains(oauth)){
-        return getStaticCom() + "/support";
+            return link.replace(proxyoauth, oauth);
-    }
+        }
 
-    public static String oauthFix(){
+        if(link.contains(vkstatic)){
-        return "https://oauth.vk.com/blank.html";
+            return link.replace(proxystatic, vkstatic);
-    }
+        }
 
-    public static String getApiCom(){
+        return link;
-        String string = getPrefsValue("proxyapi");
-        if(!proxy() & string.isEmpty()) return "api.vk.com";
-        return string;
     }
 
     public static String getAwayPhpCom(){
-        String string = getPrefsValue("proxyapi");
+        String proxyapi = getPrefsValue("proxyapi");
-        if(!proxy() & string.isEmpty()) return "m.vk.com";
-        return string;
-    }
 
-    public static String getOauthCom(){
+        if(!proxy() & proxyapi.isEmpty()){
-        String string = getPrefsValue("proxyoauth");
+            return "m.vk.com";
-        if(!proxy() & string.isEmpty()) return "oauth.vk.com";
+        }
-        return string;
-    }
 
-    public static String getStaticCom(){
+        return proxyapi;
-        String string = getPrefsValue("proxystatic");
-        if(!proxy() & string.isEmpty()) return "static.vk.com";
-        return string;
-    }
-
-    public static String staticFix(String str){
-        String str2;
-        String string = getPrefsValue("proxystatic");
-
-        if(!proxy() & string.isEmpty()) return str;
-
-        str2 = string;
-        return str.replace(str2, "static.vk.com");
     }
 
     public static void setProxy(){

smali/res/values-ru/strings.xml

@@ -211,7 +211,7 @@
     <string name="api_method_cant_be_empty">Метод api не может быть пустым или null</string>
     <string name="app_install">Установить</string>
     <string name="app_launch">Запустить</string>
-    <string name="app_name">Лайт</string>
+    <string name="app_name">VTLite</string>
     <string name="app_name_orig">VK</string>
     <string name="app_remove_confirm">Вы действительно хотите удалить эту игру?</string>
     <string name="apps_remove_action">Убрать</string>

smali/res/xml/preferences_feed.xml

@@ -21,11 +21,6 @@
             android:key="adsstories"
             android:summary="@string/feed_ads_stories_summary"
             android:title="@string/vtldas" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="copyright_post"
-            android:summary="@string/feed_ads_sources_summary"
-            android:title="@string/feed_ads_sources" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlfilters">
         <Preference
@@ -56,6 +51,15 @@
             android:key="shitposting"
             android:summary="@string/shitpostingsummary"
             android:title="@string/shitposting" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="copyright_post"
+            android:summary="@string/feed_ads_sources_summary"
+            android:title="@string/feed_ads_sources" />
+        <EditTextPreference
+            android:defaultValue=""
+            android:key="linkfilter"
+            android:title="Фильтр ссылок в источнике" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlrecommend">
         <com.vtosters.lite.ui.MaterialSwitchPreference

smali/smali/androidx/core/graphics/drawable/IconCompat.smali

@@ -2741,6 +2741,10 @@
 
     const/16 v2, 0x5a
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v2
+
     invoke-virtual {p1, v1, v2, v0}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 9

smali/smali/com/facebook/GraphRequest$j.smali

@@ -139,6 +139,10 @@
 
     const/16 v2, 0x64
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v2
+
     invoke-virtual {p2, v0, v2, v1}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     const/4 p2, 0x0

smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali

@@ -137,6 +137,10 @@
 
     const/16 v3, 0xa
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v3
+
     invoke-virtual {v1, v2, v3, v0}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 10

smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali

@@ -344,6 +344,10 @@
 
     move-object/from16 v9, p2
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v3
+
     invoke-virtual {v6, v0, v3, v9}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 14

smali/smali_classes2/com/vk/about/holders2.smali

@@ -60,6 +60,10 @@
 
     move-result-object p1
 
+    invoke-static {}, Lru/vtosters/lite/utils/About;->getAppVersion()Ljava/lang/String;
+
+    move-result-object p1
+
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void

smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali

@@ -103,6 +103,10 @@
 
     const-string v0, "api.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method
 
@@ -119,6 +123,10 @@
 
     const-string v0, "api.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method
 

smali/smali_classes2/com/vk/api/base/ApiRequest.smali

@@ -1260,11 +1260,19 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 
     :cond_0
     const-string v0, "api.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method
 

smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali

@@ -122,6 +122,17 @@
 
     move-result-object v10
 
+    invoke-static {v10}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z
+
+    move-result v11
+
+    if-nez v11, :cond_229
+
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_0
+
+    :cond_229
     if-eqz v10, :cond_0
 
     .line 7
@@ -257,7 +268,7 @@
     goto :goto_2
 
     :cond_6
-    const-string v0, "ads"
+    const-string v0, "null"
 
     .line 14
     :goto_2
@@ -528,6 +539,19 @@
 
     move-object/from16 v21, v5
 
+    invoke-static {v13}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z
+
+    move-result v16
+
+    if-nez v16, :cond_228
+
+    add-int/lit8 v12, v12, 0x1
+
+    move-object/from16 v5, v21
+
+    goto :goto_7
+
+    :cond_228
     if-eqz v13, :cond_c
 
     .line 34
@@ -679,6 +703,8 @@
 
     .line 42
     :goto_c
+    const/4 v2, 0x0
+
     new-instance v32, Lcom/vk/dto/discover/DiscoverItem;
 
     move-object/from16 v4, v32

smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali

@@ -34,7 +34,7 @@
 .end method
 
 .method private final a(Landroid/util/SparseArray;Lorg/json/JSONArray;)Landroid/util/SparseArray;
-    .locals 4
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -65,6 +65,17 @@
 
     move-result-object v2
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z
+
+    move-result v10
+
+    if-nez v10, :cond_2
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
     if-eqz v2, :cond_0
 
     .line 47
@@ -200,7 +211,7 @@
 .end method
 
 .method private final b(Landroid/util/SparseArray;Lorg/json/JSONArray;)Landroid/util/SparseArray;
-    .locals 4
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -231,6 +242,17 @@
 
     move-result-object v2
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z
+
+    move-result v10
+
+    if-nez v10, :cond_2
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
     if-eqz v2, :cond_0
 
     .line 3

smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali

@@ -71,5 +71,9 @@
 
     const-string v0, "api.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method

smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali

@@ -114,6 +114,10 @@
 
     const-string v3, "https://oauth.vk.com/blank.html"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     .line 7
     invoke-virtual {p1, v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 

smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali

@@ -202,6 +202,10 @@
     :cond_0
     const-string v0, "https://oauth.vk.com/authorize"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     .line 3
     invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 

smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali

@@ -1038,6 +1038,10 @@
 
     const/16 v4, 0x64
 
+    invoke-static {v4}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v4
+
     invoke-virtual {v2, v3, v4, v1}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 4

smali/smali_classes2/com/vk/auth/RestoreUtils.smali

@@ -47,6 +47,10 @@
 
     const-string v1, "static.vk.com/restore"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     .line 21
     invoke-virtual {v0, v1}, Landroid/net/Uri$Builder;->appendPath(Ljava/lang/String;)Landroid/net/Uri$Builder;
 

smali/smali_classes2/com/vk/auth/VkAuthModel.smali

@@ -657,6 +657,10 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     if-eqz v0, :cond_0
 
     goto :goto_0

smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali

@@ -56,6 +56,10 @@
 
     const-string v0, "oauth.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     invoke-static {v0, p2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2

smali/smali_classes2/com/vk/balance/BalancePresenter.smali

@@ -166,6 +166,10 @@
 
     const-string v2, "https://static.vk.com/promo_codes/"
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
     const/4 v3, 0x2
 
     invoke-direct {v0, v2, v1, v3, v1}, Lcom/vk/webapp/VkUiFragment$a;-><init>(Ljava/lang/String;Ljava/lang/Class;ILkotlin/jvm/internal/DefaultConstructorMarker;)V

smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali

@@ -640,6 +640,10 @@
     const-string v0, ""
 
     :goto_0
+    invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getAwayPhpCom()Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method
 

smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali

@@ -276,6 +276,10 @@
 
     const/16 v10, 0x55
 
+    invoke-static {v10}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v10
+
     invoke-virtual {v0, v9, v10, v7}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 17

smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali

@@ -187,6 +187,10 @@
 
     const-string v3, "https://api.vk.com/method/execute"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     invoke-static {p1, v3, v1, v0, v2}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
 
     move-result p1

smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali

@@ -275,6 +275,10 @@
 
     const-string v3, "api.vk.com"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     .line 35
     invoke-static {v3, v7}, Lkotlin/Tuples;->a(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 

smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali

@@ -1266,6 +1266,10 @@
 
     const/16 v5, 0x5a
 
+    invoke-static {v5}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v5
+
     invoke-virtual {p1, v4, v5, v2}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 35

smali/smali_classes3/com/vk/medianative/MediaImageEncoder.smali

@@ -89,6 +89,10 @@
     :try_start_1
     sget-object p1, Landroid/graphics/Bitmap$CompressFormat;->JPEG:Landroid/graphics/Bitmap$CompressFormat;
 
+    invoke-static {p2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result p2
+
     invoke-virtual {p0, p1, p2, v1}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     move-result p0

smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali

@@ -56,6 +56,10 @@
 
     const-string v4, "static.vk.com"
 
+    invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
     const/4 v5, 0x2
 
     const/4 v6, 0x0

smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali

@@ -84,6 +84,10 @@
 
     const-string v4, "static.vk.com"
 
+    invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
     const/4 v5, 0x2
 
     const/4 v6, 0x0

smali/smali_classes4/com/vk/qrcode/QRUtils.smali

@@ -316,6 +316,10 @@
 
     const/16 v2, 0x64
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v2
+
     invoke-virtual {p1, v1, v2, v0}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
     .line 13

smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali

@@ -6659,6 +6659,10 @@
 
     const/16 v2, 0x64
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I
+
+    move-result v2
+
     invoke-virtual {p1, v0, v2, v1}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0

smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali

@@ -132,6 +132,10 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     if-eqz v0, :cond_0
 
     return-object v0

smali/smali_classes4/com/vk/webapp/VkUiFragment.smali

@@ -1217,6 +1217,10 @@
 
     const-string v3, "static.vk.com"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     .line 1
     invoke-static {p1, v3, v2, v1, v0}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 
@@ -1964,6 +1968,10 @@
 
     move-result-object v1
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     .line 9
     invoke-static {v1, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
 

smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali

@@ -1471,6 +1471,8 @@
 
     const-string p1, "redirect_uri"
 
+    const-string p3, "https://oauth.vk.com/blank.html"
+
     .line 35
     invoke-static {p1, p3}, Lkotlin/Tuples;->a(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
@@ -1489,6 +1491,10 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_0
@@ -1579,6 +1585,10 @@
 
     const-string p3, "https://oauth.vk.com/authorize"
 
+    invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p3
+
     .line 43
     invoke-static {p3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 

smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali

@@ -240,6 +240,10 @@
 
     move-result-object p3
 
+    invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p3
+
     if-eqz p3, :cond_2
 
     goto :goto_0

smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali

@@ -182,6 +182,10 @@
 
     .line 16
     :goto_0
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V

smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali

@@ -97,6 +97,10 @@
 
     const-string v4, "oauth.vk.com"
 
+    invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
     invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v3

smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali

@@ -207,6 +207,10 @@
 
     const-string v4, "https://oauth.vk.com/blank.html"
 
+    invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
     .line 14
     invoke-virtual {v3, v2, v4}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -292,6 +296,10 @@
 
     const-string v1, "oauth.vk.com"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     invoke-virtual {v0, v1}, Landroid/net/Uri$Builder;->authority(Ljava/lang/String;)Landroid/net/Uri$Builder;
 
     move-result-object v0

smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali

@@ -82,6 +82,10 @@
 
     .line 3
     :goto_0
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1

smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali

@@ -326,6 +326,10 @@
 
     const-string v3, "oauth.vk.com"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     invoke-virtual {v3, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v1

smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali

@@ -208,6 +208,10 @@
 
     const-string v0, "api.vk.com"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     return-object v0
 .end method
 
@@ -301,6 +305,10 @@
 
     const-string v3, "api.vk.com"
 
+    invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     invoke-static {v0, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0

smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali

@@ -68,6 +68,10 @@
 
     const-string v1, "oauth.vk.com"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0

smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali

@@ -305,6 +305,10 @@
     :goto_5
     const-string p2, "api.vk.com"
 
+    invoke-static {p2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
     .line 13
     invoke-virtual {p1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 

smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali

@@ -1986,6 +1986,10 @@
 
     const-string v1, "static.vk.com"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     const-string v2, "previous_vkui"
 
     invoke-direct {v0, p1, v1, v2}, Lcom/vtosters/lite/fragments/n2/SettingsDebugFragment$n;-><init>(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V
@@ -2000,6 +2004,10 @@
 
     const-string v2, "previous_oauth"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     invoke-direct {v0, p1, v1, v2}, Lcom/vtosters/lite/fragments/n2/SettingsDebugFragment$n;-><init>(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
@@ -2010,6 +2018,10 @@
 
     const-string v1, "api.vk.com"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     const-string v2, "previous_apiHosts"
 
     invoke-direct {v0, p1, v1, v2}, Lcom/vtosters/lite/fragments/n2/SettingsDebugFragment$n;-><init>(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V

smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali

@@ -40,6 +40,10 @@
 
     const-string v1, "oauth.vk.com"
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
     invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
@@ -178,6 +182,10 @@
 
     const-string v0, "https://oauth.vk.com/blank.html#state=webview_refresh_access_token"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     .line 2
     invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 

smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali

@@ -1012,6 +1012,10 @@
 
     const-string v2, "https://oauth.vk.com/webview_token"
 
+    invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
     .line 3
     invoke-static {v2}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -1198,6 +1202,10 @@
 
     const-string v0, "https://oauth.vk.com/webview_token"
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     .line 1
     invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 

smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali

@@ -70,6 +70,10 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
     if-eqz v0, :cond_0
 
     return-object v0

smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali

@@ -2129,7 +2129,9 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x1
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z
+
+    move-result v0
 
     goto :goto_0
 
@@ -2154,7 +2156,9 @@
 
     if-eqz v4, :cond_1
 
-    const/4 v4, 0x1
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z
+
+    move-result v4
 
     goto :goto_1
 
@@ -5951,6 +5955,15 @@
     return-void
 
     :cond_0
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
     const/4 v0, 0x0
 
     if-eqz p1, :cond_1