From 097a6feeb7ac9dcc7a95c9f83aa43c93036b6f18 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:27:18 +0300 Subject: [PATCH 1/9] pic compress inject --- smali/smali/androidx/core/graphics/drawable/IconCompat.smali | 4 ++++ smali/smali/com/facebook/GraphRequest$j.smali | 4 ++++ smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali | 4 ++++ .../smali_classes2/com/vk/attachpicker/GraffitiActivity.smali | 4 ++++ .../com/vk/contacts/ContactsSyncAdapterService$c.smali | 4 ++++ .../com/vk/im/engine/internal/upload/VideoUploader.smali | 4 ++++ .../smali_classes3/com/vk/medianative/MediaImageEncoder.smali | 4 ++++ smali/smali_classes4/com/vk/qrcode/QRUtils.smali | 4 ++++ smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali | 4 ++++ 9 files changed, 36 insertions(+) diff --git a/smali/smali/androidx/core/graphics/drawable/IconCompat.smali b/smali/smali/androidx/core/graphics/drawable/IconCompat.smali index 6ec6116f2..0df3a41fb 100644 --- a/smali/smali/androidx/core/graphics/drawable/IconCompat.smali +++ b/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 diff --git a/smali/smali/com/facebook/GraphRequest$j.smali b/smali/smali/com/facebook/GraphRequest$j.smali index bdf281bfc..8a6c35120 100644 --- a/smali/smali/com/facebook/GraphRequest$j.smali +++ b/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 diff --git a/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali b/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali index 191c6e363..93f0f4131 100644 --- a/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali +++ b/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 diff --git a/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali b/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali index 248553d43..3c7da15bb 100644 --- a/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali +++ b/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 diff --git a/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali b/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali index cad39f859..5fabed72c 100644 --- a/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali +++ b/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 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali b/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali index f1d908d5f..d4fe35cb8 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali +++ b/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 diff --git a/smali/smali_classes3/com/vk/medianative/MediaImageEncoder.smali b/smali/smali_classes3/com/vk/medianative/MediaImageEncoder.smali index 96d7a5129..925761e7f 100644 --- a/smali/smali_classes3/com/vk/medianative/MediaImageEncoder.smali +++ b/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 diff --git a/smali/smali_classes4/com/vk/qrcode/QRUtils.smali b/smali/smali_classes4/com/vk/qrcode/QRUtils.smali index 8042ee274..dcba6459f 100644 --- a/smali/smali_classes4/com/vk/qrcode/QRUtils.smali +++ b/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 diff --git a/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali b/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali index c5904af35..a870c4211 100644 --- a/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali +++ b/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 From bded70f6c6f779f5e116279b2230976ac1a38246 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:27:27 +0300 Subject: [PATCH 2/9] pic compress inject --- smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali b/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali index 8e959dc7a..f886d346c 100644 --- a/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali +++ b/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 From 6c1130aed2ada314aaa1d93afa587fc0d9547bc1 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:31:29 +0300 Subject: [PATCH 3/9] voice inject --- .../com/vtosters/lite/ui/WriteBar.smali | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali index 010f54106..91a48bed6 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali +++ b/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_1 + + return-void + + :cond_1 const/4 v0, 0x0 if-eqz p1, :cond_1 From 3167dfab097e7d952d1a5e8f55785f9da97a0fbd Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:38:57 +0300 Subject: [PATCH 4/9] vk api proxy inj --- .../smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali | 8 ++++++++ smali/smali_classes2/com/vk/api/base/ApiRequest.smali | 8 ++++++++ smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali | 4 ++++ .../httpexecutor/core/HttpRequestExecutorProvider.smali | 4 ++++ smali/smali_classes4/com/vk/webapp/VkUiFragment.smali | 4 ++++ .../com/vk/webapp/helpers/WebAppApiHelper.smali | 4 ++++ .../com/vtosters/lite/VKApplication$initNetwork$1.smali | 4 ++++ .../com/vtosters/lite/api/AppVKApiCallback.smali | 8 ++++++++ .../vtosters/lite/fragments/n2/DebugDomainsFilter.smali | 4 ++++ .../lite/fragments/n2/SettingsDebugFragment.smali | 4 ++++ .../im/ImEngineProvider$getApiManager$apiConfig$1.smali | 4 ++++ smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali | 4 ++-- 12 files changed, 58 insertions(+), 2 deletions(-) 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 bc6938231..c7ede9495 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,6 +103,10 @@ const-string v0, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method @@ -119,6 +123,10 @@ const-string v0, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method diff --git a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali index 59e645d8b..52063930c 100644 --- a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali +++ b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali @@ -1260,11 +1260,19 @@ move-result-object v0 + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 :cond_0 const-string v0, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method 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 d96579734..c26e81bf0 100644 --- a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali +++ b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali @@ -71,5 +71,9 @@ const-string v0, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method diff --git a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali index b203d2686..db52634d9 100644 --- a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali +++ b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali @@ -275,6 +275,10 @@ const-string v3, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v3 + .line 35 invoke-static {v3, v7}, Lkotlin/Tuples;->a(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali index 49e5f6918..5bfa06c66 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali +++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali @@ -1964,6 +1964,10 @@ move-result-object v1 + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()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 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali index 9fef3ccdf..a897549e8 100644 --- a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali +++ b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali @@ -182,6 +182,10 @@ .line 16 :goto_0 + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + new-instance v1, Ljava/lang/StringBuilder; invoke-direct {v1}, Ljava/lang/StringBuilder;->()V 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 dc2faac22..848594d8e 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali @@ -82,6 +82,10 @@ .line 3 :goto_0 + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()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 diff --git a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali index caeb73917..e200f3c49 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali @@ -208,6 +208,10 @@ const-string v0, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method @@ -301,6 +305,10 @@ const-string v3, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()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 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 a2646c04a..8f4122b91 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali @@ -305,6 +305,10 @@ :goto_5 const-string p2, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object p2 + .line 13 invoke-virtual {p1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z 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 f72599917..63f41932d 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali @@ -2010,6 +2010,10 @@ const-string v1, "api.vk.com" + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()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;->(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V 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 162f431d9..3f2403524 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,6 +70,10 @@ move-result-object v0 + invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + + move-result-object v0 + if-eqz v0, :cond_0 return-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali index 91a48bed6..7f71697d7 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali @@ -5959,11 +5959,11 @@ move-result v0 - if-nez v0, :cond_1 + if-nez v0, :cond_2 return-void - :cond_1 + :cond_2 const/4 v0, 0x0 if-eqz p1, :cond_1 From 0bc2d2b89605b7b5a906dd4fc908da7badff6a21 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 10:37:49 +0300 Subject: [PATCH 5/9] added proxied static and oauth + refactored by copilot --- .../java/ru/vtosters/lite/dnr/DNRModule.java | 4 +- .../java/ru/vtosters/lite/foaf/FoafBase.java | 4 +- .../java/ru/vtosters/lite/utils/Proxy.java | 79 ++++++++----------- .../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 | 4 + .../vk/api/sdk/ui/VKWebViewAuthActivity.smali | 4 + .../attachpicker/u/j/FiltersController.smali | 4 + .../com/vk/auth/RestoreUtils.smali | 4 + .../com/vk/auth/VkAuthModel.smali | 4 + .../com/vk/auth/y/b/UrlCheckFragment$b.smali | 4 + .../com/vk/balance/BalancePresenter.smali | 4 + .../common/links/BrowserUtils$Companion.smali | 4 + .../metrics/traffic/TrafficAccumulator.smali | 4 + .../core/HttpRequestExecutorProvider.smali | 2 +- .../community/CommunityChatsFragment$c.smali | 4 + .../ui/community/CommunityChatsFragment.smali | 4 + .../com/vk/webapp/VkUiFragment$b.smali | 4 + .../com/vk/webapp/VkUiFragment.smali | 6 +- .../com/vk/webapp/bridges/AndroidBridge.smali | 10 +++ .../webapp/bridges/VkUiConnectBridge$a.smali | 4 + .../vk/webapp/helpers/WebAppApiHelper.smali | 2 +- .../com/vtosters/lite/SDKAuthActivity$d.smali | 4 + .../com/vtosters/lite/SDKAuthActivity.smali | 8 ++ .../lite/VKApplication$initNetwork$1.smali | 2 +- .../vtosters/lite/ValidationActivity$a.smali | 4 + .../vtosters/lite/api/AppVKApiCallback.smali | 4 +- .../money/MoneyWebViewFragment$a.smali | 4 + .../fragments/n2/DebugDomainsFilter.smali | 2 +- .../fragments/n2/SettingsDebugFragment.smali | 10 ++- .../general/fragments/WebViewFragment$a.smali | 8 ++ .../general/fragments/WebViewFragment.smali | 8 ++ ...neProvider$getApiManager$apiConfig$1.smali | 2 +- 34 files changed, 159 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java index 8216b71bb..634cef83c 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java +++ b/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("Чат помечен как прочитанный!"); }); } 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 4e35c3837..536078727 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/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="; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java index bfe12894d..73716165e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java +++ b/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(){ - return getOauthComHttps() + "/authorize"; - } + public static String linkReplacer(String link){ + String vkapi = "api.vk.com"; + String oauth = "oauth.vk.com"; + String vkstatic = "static.vk.com"; - public static String getOauthComAuthClient(){ - return getOauthComAuth() + "?client_id="; - } + String proxiedvkapi = getPrefsValue("proxyapi"); + String proxiedoauth = getPrefsValue("proxyoauth"); + String proxedvkstatic = getPrefsValue("proxystatic"); - public static String getOauthComBlank(){ - return getOauthComHttps() + "/blank.html"; - } + if(!proxy() || link.isEmpty()){ + return link; + } - public static String getOauthComBlankRedirect(){ - return "&redirect_uri=" + getOauthComBlank(); - } + if(proxiedvkapi.isEmpty() || proxiedoauth.isEmpty() || proxedvkstatic.isEmpty()){ + Log.d("VTLite", "Proxy is not set" + " " + proxiedvkapi + " " + proxiedoauth + " " + proxedvkstatic); + return link; + } - public static String getOauthComHttps(){ - return "https://" + getOauthCom(); - } + if(link.contains(vkapi)){ + return link.replace(proxiedvkapi, vkapi); + } - public static String getStaticComSupport(){ - return getStaticCom() + "/support"; - } + if(link.contains(oauth)){ + return link.replace(proxiedoauth, oauth); + } - public static String oauthFix(){ - return "https://oauth.vk.com/blank.html"; - } + if(link.contains(vkstatic)){ + return link.replace(proxedvkstatic, vkstatic); + } - public static String getApiCom(){ - String string = getPrefsValue("proxyapi"); - if(!proxy() & string.isEmpty()) return "api.vk.com"; - return string; + return link; } public static String getAwayPhpCom(){ - String string = getPrefsValue("proxyapi"); - if(!proxy() & string.isEmpty()) return "m.vk.com"; - return string; - } + String proxyapi = getPrefsValue("proxyapi"); - public static String getOauthCom(){ - String string = getPrefsValue("proxyoauth"); - if(!proxy() & string.isEmpty()) return "oauth.vk.com"; - return string; - } + if(!proxy() & proxyapi.isEmpty()){ + return "m.vk.com"; + } - public static String getStaticCom(){ - 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"); + return proxyapi; } public static void setProxy(){ 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 c7ede9495..51c2c7d52 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -123,7 +123,7 @@ const-string v0, "api.vk.com" - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->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 52063930c..853b05866 100644 --- a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali +++ b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali @@ -1260,7 +1260,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -1269,7 +1269,7 @@ :cond_0 const-string v0, "api.vk.com" - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->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 c26e81bf0..14000bb32 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->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 8496a2973..04a3ba1ec 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,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; 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 6d5c5a3af..0ac9fd16e 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali +++ b/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; 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 c96a88155..5d468b13c 100644 --- a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali +++ b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali @@ -21,6 +21,10 @@ 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/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v1 + invoke-direct {v0, v1}, Lorg/json/JSONObject;->(Ljava/lang/String;)V const-string v1, "response" diff --git a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali index 81e3eb492..4e5c966fd 100644 --- a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali +++ b/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; diff --git a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali index f24a9accc..ffe337794 100644 --- a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali +++ b/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 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 f9ab45b7a..b8489c7e2 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,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 diff --git a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali index 54fdd36ef..09c555b6d 100644 --- a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali +++ b/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;->(Ljava/lang/String;Ljava/lang/Class;ILkotlin/jvm/internal/DefaultConstructorMarker;)V 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 161f769e2..e2b497028 100644 --- a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali +++ b/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 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 06ff881d4..2138786b8 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,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 diff --git a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali index db52634d9..976e99432 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->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 38b3161ce..58fa86616 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,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 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 a70fa2c34..2ee899efa 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali +++ b/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 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali index e526dced8..33a811825 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali +++ b/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 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali index 5bfa06c66..5d7728c42 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali +++ b/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,7 +1968,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->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 7281db7a1..01ca835b5 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali +++ b/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; 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 eb3f7632e..0422f4edc 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali +++ b/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 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali index a897549e8..8dcb6b580 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->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 7b87083b4..746f34c50 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali +++ b/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 diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali index 02a889e3c..a0134935a 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali +++ b/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 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 848594d8e..b9a069bea 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->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 1cd32d4ba..4c4865c5f 100644 --- a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali +++ b/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 diff --git a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali index e200f3c49..991669f4a 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -305,7 +305,7 @@ const-string v3, "api.vk.com" - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->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 266be7722..8cc503cca 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,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 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 8f4122b91..7b164cdea 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/lite/utils/Proxy;->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 63f41932d..6b6faa00f 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali +++ b/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;->(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;->(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V return-object v0 @@ -2010,7 +2018,7 @@ const-string v1, "api.vk.com" - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->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 31fe67709..3ef30980a 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,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 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 e5d0e2a76..194112270 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali +++ b/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; 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 3f2403524..f091835d3 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 {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 From 8da5f35c3358a58981c1e3e7f9ff78518f1ac69b Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 10:39:31 +0300 Subject: [PATCH 6/9] renamed some strings --- .../main/java/ru/vtosters/lite/utils/Proxy.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java index 73716165e..a6dffd8fc 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java @@ -15,29 +15,29 @@ public class Proxy{ String oauth = "oauth.vk.com"; String vkstatic = "static.vk.com"; - String proxiedvkapi = getPrefsValue("proxyapi"); - String proxiedoauth = getPrefsValue("proxyoauth"); - String proxedvkstatic = getPrefsValue("proxystatic"); + String proxproxyapi = getPrefsValue("proxyapi"); + String proxyoauth = getPrefsValue("proxyoauth"); + String proxystatic = getPrefsValue("proxystatic"); if(!proxy() || link.isEmpty()){ return link; } - if(proxiedvkapi.isEmpty() || proxiedoauth.isEmpty() || proxedvkstatic.isEmpty()){ - Log.d("VTLite", "Proxy is not set" + " " + proxiedvkapi + " " + proxiedoauth + " " + proxedvkstatic); + if(proxproxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()){ + Log.d("VTLite", "Proxy is not set" + " " + proxproxyapi + " " + proxyoauth + " " + proxystatic); return link; } if(link.contains(vkapi)){ - return link.replace(proxiedvkapi, vkapi); + return link.replace(proxproxyapi, vkapi); } if(link.contains(oauth)){ - return link.replace(proxiedoauth, oauth); + return link.replace(proxyoauth, oauth); } if(link.contains(vkstatic)){ - return link.replace(proxedvkstatic, vkstatic); + return link.replace(proxystatic, vkstatic); } return link; From 8953ee1f7f040fe5c73870f335a80e434e17b25d Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 10:49:25 +0300 Subject: [PATCH 7/9] added app version to about --- smali/res/values-ru/strings.xml | 2 +- smali/smali_classes2/com/vk/about/holders2.smali | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index 0fd22d530..73f4f02f0 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -211,7 +211,7 @@ Метод api не может быть пустым или null Установить Запустить - Лайт + VTLite VK Вы действительно хотите удалить эту игру? Убрать diff --git a/smali/smali_classes2/com/vk/about/holders2.smali b/smali/smali_classes2/com/vk/about/holders2.smali index bd8ee9a23..d617ad825 100644 --- a/smali/smali_classes2/com/vk/about/holders2.smali +++ b/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 From f7a137537c9ebef44e5cfa0fb182f723c1b1f5a0 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 11:43:38 +0300 Subject: [PATCH 8/9] fixed ads in discover --- .../java/ru/vtosters/lite/utils/Newsfeed.java | 10 +++---- .../ru/vtosters/lite/utils/Preferences.java | 4 --- .../com/vk/api/discover/DiscoverGet$a$a.smali | 28 ++++++++++++++++++- .../com/vk/api/discover/DiscoverGet$a.smali | 26 +++++++++++++++-- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index 7879b2c0a..b013390f5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -98,10 +98,10 @@ 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); @@ -112,7 +112,7 @@ public class Newsfeed{ 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 + return copyrightlink.contains("vk.com") || copyright_post(); // fuck you, it doesn't work to detect link value // example of response //"copyright": { @@ -123,7 +123,7 @@ public class Newsfeed{ //} } - return true; + return false; } private static boolean isRecomsGroup(String src){ diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 00353460e..2e198fd38 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/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); } diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali index 242ee7533..39d50f796 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali +++ b/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 diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali index 92a705e82..a1b0d8913 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali +++ b/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 From 27c8a1575fcafcad800d12789f07de17beaa9089 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 11:54:35 +0300 Subject: [PATCH 9/9] added filter for copyright links --- .../java/ru/vtosters/lite/utils/Newsfeed.java | 23 ++++++++++++------- smali/res/xml/preferences_feed.xml | 14 +++++++---- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index b013390f5..7e85c00ea 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -48,9 +48,11 @@ import java.util.List; public class Newsfeed{ public static List mFilters; + public static List 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){ @@ -108,19 +115,19 @@ public class Newsfeed{ } 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 - //"copyright": { - //"id": 251706814, - //"link": "https://vk.com/wall251706814_9016", - //"type": "owner", - //"name": "Маргарита Буруня" - //} + return copyright_post(); } return false; diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 1a25e8505..785ebddc9 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -21,11 +21,6 @@ android:key="adsstories" android:summary="@string/feed_ads_stories_summary" android:title="@string/vtldas" /> - + +