From e06e5ac3a7d5008f556e30c32bc06d5d76b163a9 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 15 Jul 2022 10:04:47 +0300 Subject: [PATCH] some hooks refactoring --- .../LocaleUtils.java => hooks/DateHook.java} | 24 ++--- .../lite/hooks/FragAnimationHook.java | 17 ++++ .../gcm/GCMFix.java => hooks/GcmHook.java} | 12 +-- .../lite/{utils => hooks}/JsonInjectors.java | 2 +- .../ru/vtosters/lite/hooks/NewsfeedHook.java | 62 ++++++++++++ .../OnlineFormatterHook.java} | 6 +- .../PollUtils.java => hooks/PollHook.java} | 4 +- .../lite/{utils => hooks}/ProxyHook.java | 48 ++++++++- .../lite/hooks/StartFragmentHook.java | 82 +++++++++++++++ .../ru/vtosters/lite/hooks/StoriesHook.java | 15 +++ .../Toggles.java => hooks/TogglesHook.java} | 5 +- .../VKUIInjector.java => hooks/VKUIHook.java} | 15 ++- .../vtosters/lite/utils/FragAnimationKit.java | 10 -- .../java/ru/vtosters/lite/utils/Globals.java | 12 +-- .../java/ru/vtosters/lite/utils/Newsfeed.java | 99 +------------------ .../ru/vtosters/lite/utils/OpusLoader.java | 61 ------------ .../java/ru/vtosters/lite/utils/Proxy.java | 43 -------- .../java/ru/vtosters/lite/utils/SSFS.java | 2 +- .../java/ru/vtosters/lite/utils/Themes.java | 5 +- .../com/vk/api/base/ApiConfig$a$a$a.smali | 4 +- .../com/vk/api/base/ApiRequest.smali | 4 +- .../com/vk/api/discover/DiscoverGet$a$a.smali | 4 +- .../com/vk/api/discover/DiscoverGet$a.smali | 4 +- .../TokenConfirmationHandlerChainCall.smali | 4 +- .../com/vk/api/sdk/VKApiConfig$6.smali | 2 +- .../com/vk/api/sdk/auth/VKAuthParams$a.smali | 2 +- .../api/sdk/ui/VKWebViewAuthActivity$b.smali | 2 +- .../vk/api/sdk/ui/VKWebViewAuthActivity.smali | 2 +- .../attachpicker/u/j/FiltersController.smali | 2 +- .../com/vk/auth/RestoreUtils.smali | 2 +- .../com/vk/auth/VkAuthModel.smali | 2 +- .../auth/w/a/ChooseAuthMethodFragment.smali | 2 +- .../com/vk/auth/y/b/UrlCheckFragment$b.smali | 2 +- .../com/vk/balance/BalancePresenter.smali | 2 +- .../core/api/i/CatalogGetFriends.smali | 2 +- .../core/api/i/CatalogGetSectionFriends.smali | 2 +- .../common/links/BrowserUtils$Companion.smali | 2 +- .../vk/core/formatters/OnlineFormatter.smali | 2 +- .../j/b/ParentSupportFragmentManager.smali | 4 +- .../metrics/traffic/TrafficAccumulator.smali | 2 +- .../com/vk/dto/menu/MenuResponse$b.smali | 2 +- .../vk/dto/menu/SuperAppMenuResponse$b.smali | 2 +- .../stories/model/GetStoriesResponse.smali | 2 +- .../com/vk/dto/user/VisibleStatus.smali | 2 +- .../core/HttpRequestExecutorProvider.smali | 2 +- .../api_parsers/ConversationParser$a.smali | 2 +- .../delegates/DocAttachViewTypeDelegate.smali | 2 +- .../navigation/right/RightMenuPresenter.smali | 2 +- .../presenters/NewsfeedPresenter.smali | 2 +- .../vk/polls/ui/views/PollOptionView.smali | 2 +- .../community/CommunityChatsFragment$c.smali | 2 +- .../ui/community/CommunityChatsFragment.smali | 2 +- .../com/vk/toggle/FeatureManager.smali | 4 +- .../com/vk/webapp/VkUiFragment$b.smali | 2 +- .../com/vk/webapp/VkUiFragment.smali | 4 +- .../com/vk/webapp/bridges/AndroidBridge.smali | 4 +- .../webapp/bridges/VkUiConnectBridge$a.smali | 2 +- .../vk/webapp/helpers/WebAppApiHelper.smali | 2 +- .../com/vk/webapp/helpers/WebClients.smali | 2 +- .../com/vtosters/lite/MainActivity.smali | 4 +- .../com/vtosters/lite/SDKAuthActivity$d.smali | 2 +- .../com/vtosters/lite/SDKAuthActivity.smali | 4 +- .../lite/VKApplication$initNetwork$1.smali | 2 +- .../com/vtosters/lite/VKApplication.smali | 4 +- .../vtosters/lite/ValidationActivity$a.smali | 2 +- .../vtosters/lite/api/AppVKApiCallback.smali | 4 +- .../lite/api/ExtendedUserProfile$d.smali | 2 +- .../api/newsfeed/NewsfeedCustomGet$a.smali | 6 +- .../lite/api/newsfeed/NewsfeedGet.smali | 4 +- .../com/vtosters/lite/api/wall/WallGet.smali | 2 +- .../money/MoneyWebViewFragment$a.smali | 2 +- .../fragments/n2/DebugDomainsFilter.smali | 2 +- .../fragments/n2/SettingsDebugFragment.smali | 6 +- .../general/fragments/WebViewFragment$a.smali | 4 +- .../general/fragments/WebViewFragment.smali | 4 +- ...neProvider$getApiManager$apiConfig$1.smali | 2 +- 76 files changed, 348 insertions(+), 330 deletions(-) rename app/src/main/java/ru/vtosters/lite/{utils/LocaleUtils.java => hooks/DateHook.java} (96%) create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java rename app/src/main/java/ru/vtosters/lite/{audio/gcm/GCMFix.java => hooks/GcmHook.java} (95%) rename app/src/main/java/ru/vtosters/lite/{utils => hooks}/JsonInjectors.java (99%) create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java rename app/src/main/java/ru/vtosters/lite/{utils/OnlineFormatter.java => hooks/OnlineFormatterHook.java} (98%) rename app/src/main/java/ru/vtosters/lite/{utils/PollUtils.java => hooks/PollHook.java} (93%) rename app/src/main/java/ru/vtosters/lite/{utils => hooks}/ProxyHook.java (72%) create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java rename app/src/main/java/ru/vtosters/lite/{utils/Toggles.java => hooks/TogglesHook.java} (99%) rename app/src/main/java/ru/vtosters/lite/{utils/VKUIInjector.java => hooks/VKUIHook.java} (90%) delete mode 100644 app/src/main/java/ru/vtosters/lite/utils/OpusLoader.java diff --git a/app/src/main/java/ru/vtosters/lite/utils/LocaleUtils.java b/app/src/main/java/ru/vtosters/lite/hooks/DateHook.java similarity index 96% rename from app/src/main/java/ru/vtosters/lite/utils/LocaleUtils.java rename to app/src/main/java/ru/vtosters/lite/hooks/DateHook.java index 4001065a3..ca6031fa7 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/LocaleUtils.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/DateHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; import static ru.vtosters.lite.utils.Globals.getString; @@ -10,17 +10,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -public class LocaleUtils{ - public static String getLocale(){ - String string = getPrefsValue("lang_value"); - - if (string.equals("system")) { - return Locale.getDefault().getLanguage(); - } - - return string.isEmpty() ? Locale.getDefault().getLanguage() : string; - } - +public class DateHook{ public static boolean fulltime(){ return getPrefsValue("dateformat").equals("noyear") || getPrefsValue("dateformat").equals("full") || getPrefsValue("dateformat").equals("noseconds"); } @@ -53,4 +43,14 @@ public class LocaleUtils{ return null; } } + + public static String getLocale(){ + String string = getPrefsValue("lang_value"); + + if (string.equals("system")) { + return Locale.getDefault().getLanguage(); + } + + return string.isEmpty() ? Locale.getDefault().getLanguage() : string; + } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java b/app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java new file mode 100644 index 000000000..10edd0b6b --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java @@ -0,0 +1,17 @@ +package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.utils.FragAnimationKit.setAnimations; +import static ru.vtosters.lite.utils.Globals.getPrefsValue; + +import androidx.fragment.app.FragmentTransaction; + +public class FragAnimationHook{ + public static boolean animateOpen(FragmentTransaction transaction){ + setAnimations(transaction); + + return getPrefsValue("anim_rtrn_type").equals("noanim") || getPrefsValue("anim_rtrn_type").isEmpty(); + } + + public static void animateClose(FragmentTransaction transaction){ + setAnimations(transaction); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java b/app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java similarity index 95% rename from app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java rename to app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java index abf8c2cab..8ec5ddcf8 100644 --- a/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.audio.gcm; +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Preferences.musicFixNew; @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.net.ssl.HttpsURLConnection; -public class GCMFix{ +public class GcmHook{ private static final String agent = String.format("Android-GCM/1.5 (%s %s)", Build.MODEL, Build.MODEL); public static ArrayList langs = new ArrayList<>(); private static KeyPair pair; @@ -38,12 +38,12 @@ public class GCMFix{ } public static String requestTokenV2(String orig){ - if (musicFixNew()) return "null"; // TODO FIX TOKENMOD v2 cyz vk shit + if (musicFixNew()) return "null"; return orig; } public static String requestToken(String orig){ - if (musicFixNew()) return "{null}"; // TODO FIX TOKENMOD v2 cyz vk shit + if (musicFixNew()) return "{null}"; if (orig.equals("")) return requestToken(); return orig; } @@ -66,7 +66,7 @@ public class GCMFix{ List params = new ArrayList<>(); fillParams(params, sig, pub2, xappide, Long.parseLong(aid.split(" ")[1].split(":")[0]), false); - Callback callback = str -> GCMFix.lambdaRequestToken(sb, wait, str); + Callback callback = str -> GcmHook.lambdaRequestToken(sb, wait, str); doRequest("https://android.clients.google.com/c2dm/register3", "POST", params, aid, callback); while(!wait.get()) { @@ -81,7 +81,7 @@ public class GCMFix{ String sig2 = getSig(pub22); params.clear(); fillParams(params, sig2, pub22, xappide, Long.parseLong(aid.split(" ")[1].split(":")[0]), true); - doRequest("https://android.clients.google.com/c2dm/register3", "POST", params, aid, GCMFix::lambda$requestToken$1); + doRequest("https://android.clients.google.com/c2dm/register3", "POST", params, aid, GcmHook::lambda$requestToken$1); return token; } catch (FileNotFoundException e2) { return requestToken(); diff --git a/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java similarity index 99% rename from app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java rename to app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java index addb135b2..b4c8fa077 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.f0x1d.VTVerifications.isDeveloper; import static ru.vtosters.lite.f0x1d.VTVerifications.isPrometheus; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java new file mode 100644 index 000000000..5d1c0159e --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java @@ -0,0 +1,62 @@ +package ru.vtosters.lite.hooks; +import static java.lang.Long.MAX_VALUE; +import static ru.vtosters.lite.utils.Globals.getPrefsValue; +import static ru.vtosters.lite.utils.Newsfeed.checkCaption; +import static ru.vtosters.lite.utils.Newsfeed.checkCopyright; +import static ru.vtosters.lite.utils.Newsfeed.injectFiltersReposts; +import static ru.vtosters.lite.utils.Newsfeed.isAds; +import static ru.vtosters.lite.utils.Newsfeed.isAuthorRecommendations; +import static ru.vtosters.lite.utils.Newsfeed.isBadNew; +import static ru.vtosters.lite.utils.Newsfeed.isFriendsRecommendations; +import static ru.vtosters.lite.utils.Newsfeed.isGroupAds; +import static ru.vtosters.lite.utils.Newsfeed.isMusicBlock; +import static ru.vtosters.lite.utils.Newsfeed.isNewsBlock; +import static ru.vtosters.lite.utils.Newsfeed.isPostRecommendations; +import static ru.vtosters.lite.utils.Newsfeed.isRecomsGroup; +import static ru.vtosters.lite.utils.Preferences.vkme; + +import com.vk.core.preference.Preference; + +import org.json.JSONException; +import org.json.JSONObject; + +public class NewsfeedHook{ + public static boolean injectFilters(JSONObject obj) throws JSONException{ + var optString = obj.optString("type", ""); + if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isRecomsGroup(optString) || isMusicBlock(optString) || isNewsBlock(optString)) { + return false; + } + optString = obj.optString("post_type", ""); + if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isMusicBlock(optString) || isNewsBlock(optString)) { + return false; + } + optString = obj.optString("filters", ""); + if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString)) { + return false; + } + + if (checkCopyright(obj)) return false; + + if (isBadNew(obj.optString("text", ""))) return false; + + if (checkCaption(obj)) return false; + + if (isGroupAds(obj)) return false; + + return !injectFiltersReposts(obj); + } // inject our filters to newsfeed, getpost and discover + + public static long getUpdateNewsfeed(boolean refresh_timeout){ + if (vkme()) { + return MAX_VALUE; + } + switch(getPrefsValue("newsupdate")) { + case "no_update": + return MAX_VALUE; + case "imd_update": + return 10000L; + default: + return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); + } + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/OnlineFormatter.java b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java similarity index 98% rename from app/src/main/java/ru/vtosters/lite/utils/OnlineFormatter.java rename to app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java index a951625e7..0829a9413 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/OnlineFormatter.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java @@ -1,5 +1,4 @@ -package ru.vtosters.lite.utils; - +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.net.Request.makeRequest; import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.getUserToken; @@ -12,7 +11,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -public class OnlineFormatter{ +public class OnlineFormatterHook{ private static String AppName; public static String getAppName(int appid){ // thanks to egormetlitsky (vk mp3 mod) for helping with online ids @@ -160,3 +159,4 @@ public class OnlineFormatter{ return getString("custom_online") + " " + appname; } } + diff --git a/app/src/main/java/ru/vtosters/lite/utils/PollUtils.java b/app/src/main/java/ru/vtosters/lite/hooks/PollHook.java similarity index 93% rename from app/src/main/java/ru/vtosters/lite/utils/PollUtils.java rename to app/src/main/java/ru/vtosters/lite/hooks/PollHook.java index b62fdfbba..baf365eb2 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/PollUtils.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/PollHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Preferences.getBoolValue; @@ -9,7 +9,7 @@ import android.widget.TextView; import com.vk.dto.polls.PollOption; import com.vk.polls.ui.views.PollOptionView; -public class PollUtils{ +public class PollHook{ public static void show(PollOptionView view){ if (!getBoolValue("pollresults", false)) return; diff --git a/app/src/main/java/ru/vtosters/lite/utils/ProxyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java similarity index 72% rename from app/src/main/java/ru/vtosters/lite/utils/ProxyHook.java rename to app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java index 3f3247553..79d8847dc 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ProxyHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java @@ -1,7 +1,9 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Globals.convertDpToPixel; import static ru.vtosters.lite.utils.Globals.edit; +import static ru.vtosters.lite.utils.Globals.getPrefsValue; import static ru.vtosters.lite.utils.Globals.restartApplication; +import static ru.vtosters.lite.utils.Proxy.apiproxy; import static ru.vtosters.lite.utils.Proxy.isZaboronaEnabled; import static ru.vtosters.lite.utils.Themes.getAccentColor; import static ru.vtosters.lite.utils.Themes.getAlertStyle; @@ -11,6 +13,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.util.Log; import android.util.TypedValue; import android.view.View; import android.widget.RadioButton; @@ -86,4 +89,47 @@ public class ProxyHook{ alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor()); alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getAccentColor()); } + + public static String linkReplacer(String link){ + var vkapi = "api.vk.com"; + var oauth = "oauth.vk.com"; + var vkstatic = "static.vk.com"; + + var proxyapi = getPrefsValue("proxyapi"); + var proxyoauth = getPrefsValue("proxyoauth"); + var proxystatic = getPrefsValue("proxystatic"); + + if (!apiproxy() || link.isEmpty()) { + return link; + } + + if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) { + Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic); + return link; + } + + if (link.contains(vkapi)) { + return link.replace(proxyapi, vkapi); + } + + if (link.contains(oauth)) { + return link.replace(proxyoauth, oauth); + } + + if (link.contains(vkstatic)) { + return link.replace(proxystatic, vkstatic); + } + + return link; + } + + public static String getAwayPhpCom(){ + var proxyapi = getPrefsValue("proxyapi"); + + if (apiproxy() & !proxyapi.isEmpty()) { + return proxyapi; + } + + return "m.vk.com"; + } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java b/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java new file mode 100644 index 000000000..ae1be70a4 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java @@ -0,0 +1,82 @@ +package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.getInstance; +import static ru.vtosters.lite.utils.Globals.getPrefsValue; +import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.lite.utils.Preferences.milkshake; +import static ru.vtosters.lite.utils.Preferences.superapp; +import static ru.vtosters.lite.utils.Preferences.useNewSettings; +import static ru.vtosters.lite.utils.Preferences.vkme; + +import com.vk.apps.AppsFragment; +import com.vk.discover.ThemedFeedFragment; +import com.vk.fave.fragments.FaveTabFragment; +import com.vk.menu.MenuFragment; +import com.vk.menu.SearchMenuFragment; +import com.vk.music.fragment.MusicCatalogFragment1; +import com.vk.music.fragment.MusicFragment; +import com.vk.newsfeed.HomeFragment; +import com.vk.newsfeed.NewsfeedFragment; +import com.vk.notifications.NotificationsContainerFragment; +import com.vk.profile.catalog.CommunitiesCatalogFragment; +import com.vk.superapp.SuperAppFragment; +import com.vtosters.lite.fragments.ProfileFragment; +import com.vtosters.lite.fragments.friends.FriendsFragment; +import com.vtosters.lite.fragments.gifts.BirthdaysFragment; +import com.vtosters.lite.fragments.lives.LivesTabsFragment; +import com.vtosters.lite.fragments.money.MoneyTransfersFragment; +import com.vtosters.lite.fragments.p2.DocumentsViewFragment; +import com.vtosters.lite.fragments.s2.GroupsFragment1; +import com.vtosters.lite.fragments.t2.c.DialogsFragment; +import com.vtosters.lite.fragments.y2.VideosFragment; +import com.vtosters.lite.general.fragments.GamesFragment; +import com.vtosters.lite.general.fragments.PhotosFragment; + +public class StartFragmentHook{ + public static Class getStartFragment(){ + if (vkme()) { + return DialogsFragment.class; + } + switch(getPrefsValue("start_values")) { + case "newsfeed": + return milkshake() ? HomeFragment.class : NewsfeedFragment.class; + case "messenger": + return DialogsFragment.class; + case "groups": + return milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class; + case "music": + return getBoolValue("musicnewcatalog", true) ? MusicCatalogFragment1.class : MusicFragment.class; + case "friends": + return FriendsFragment.class; + case "photos": + return PhotosFragment.class; + case "videos": + return VideosFragment.class; + case "settings": + return useNewSettings(); + case "apps": + return AppsFragment.class; + case "discover": + return ThemedFeedFragment.class; + case "notifications": + return NotificationsContainerFragment.class; + case "money": + return MoneyTransfersFragment.class; + case "games": + return GamesFragment.class; + case "liked": + return FaveTabFragment.class; + case "menu": + return milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : MenuFragment.class; + case "profile": + return ProfileFragment.class; + case "lives": + return LivesTabsFragment.class; + case "docs": + return DocumentsViewFragment.class; + case "brtd": + return BirthdaysFragment.class; + default: + return getInstance().getSelectedTabs().get(0).fragmentClass; + } + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java new file mode 100644 index 000000000..06c80ce83 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java @@ -0,0 +1,15 @@ +package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.utils.Preferences.*; +import static ru.vtosters.lite.utils.Preferences.adsstories; + +import ru.vtosters.lite.utils.Preferences; + +public class StoriesHook{ + public static String ads(){ + return adsstories() ? "null" : "ads"; + } + + public static boolean showstories(){ + return stories(); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/Toggles.java b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java similarity index 99% rename from app/src/main/java/ru/vtosters/lite/utils/Toggles.java rename to app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java index 07554efe7..738769926 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Toggles.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java @@ -1,5 +1,4 @@ -package ru.vtosters.lite.utils; - +package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Preferences.feedcache; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.milkshake; @@ -10,7 +9,7 @@ import static ru.vtosters.lite.utils.Preferences.superapp; import com.vk.toggle.FeatureManager; import com.vk.toggle.Features; -public class Toggles{ +public class TogglesHook{ public static boolean shouldPatch(Features.Type feature){ switch(feature) { case AB_IM_LONGPOLL_MSG_BATCHING: diff --git a/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java similarity index 90% rename from app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java rename to app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java index 515400985..d757f9176 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java @@ -1,5 +1,4 @@ -package ru.vtosters.lite.utils; - +package ru.vtosters.lite.hooks; import static android.util.Base64.encodeToString; import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getPrefsValue; @@ -14,13 +13,16 @@ import static ru.vtosters.lite.utils.Themes.hex; import android.webkit.WebView; +import com.vk.articles.preload.WebCachePreloader; +import com.vtosters.lite.data.ThemeTracker; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -public class VKUIInjector{ +public class VKUIHook{ public static boolean isLoaded = false; private static String loadedCSS = ""; private static String loadedCSSAmoled = ""; @@ -90,4 +92,11 @@ public class VKUIInjector{ inject(webView, encodeToString(sb.toString().getBytes(), 2)); } } + + public static void clearWebCache(){ + ThemeTracker.a(); + isLoaded = false; + new WebView(getContext()).clearCache(true); + WebCachePreloader.e(); + } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java index a4382ab03..50f9a768e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java +++ b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java @@ -31,16 +31,6 @@ public class FragAnimationKit{ private static final int SSTactCloseEnter = resources.getIdentifier("task_close_enter", "anim", "android"); private static final int SSTactCloseExit = resources.getIdentifier("task_close_exit", "anim", "android"); - public static boolean animateOpen(FragmentTransaction transaction){ - setAnimations(transaction); - - return getPrefsValue("anim_rtrn_type").equals("noanim") || getPrefsValue("anim_rtrn_type").isEmpty(); - } - - public static void animateClose(FragmentTransaction transaction){ - setAnimations(transaction); - } - public static void setAnimations(FragmentTransaction transaction){ if (transaction != null && !getPrefsValue("anim_rtrn_type").equals("noanim")) { switch(getPrefsValue("anim_rtrn_type")) { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 4c3ce35c6..14087da29 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -4,14 +4,14 @@ import static android.graphics.Bitmap.Config; import static android.graphics.Bitmap.createBitmap; import static android.graphics.Bitmap.createScaledBitmap; import static androidx.core.content.ContextCompat.getDrawable; +import static ru.vtosters.lite.hooks.DateHook.getLocale; +import static ru.vtosters.lite.hooks.VKUIHook.isLoaded; import static ru.vtosters.lite.utils.CacheUtils.getInstance; -import static ru.vtosters.lite.utils.LocaleUtils.getLocale; import static ru.vtosters.lite.utils.Preferences.checkupdates; import static ru.vtosters.lite.utils.Preferences.preferences; import static ru.vtosters.lite.utils.ServerDialog.sendRequest; import static ru.vtosters.lite.utils.Themes.isDarkTheme; import static ru.vtosters.lite.utils.Themes.setNeededTheme; -import static ru.vtosters.lite.utils.VKUIInjector.isLoaded; import android.app.Activity; import android.app.Application; @@ -69,6 +69,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import ru.vtosters.lite.hooks.VKUIHook; import ru.vtosters.lite.ui.dialogs.DisableBattery; import ru.vtosters.lite.ui.dialogs.InstallGMS; import ru.vtosters.lite.ui.dialogs.OTADialog; @@ -333,13 +334,6 @@ public class Globals{ return getContext().getPackageName(); } - public static void clearWebCache(){ - ThemeTracker.a(); - isLoaded = false; - new WebView(getContext()).clearCache(true); - WebCachePreloader.e(); - } - public static int convertDpToPixel(float f){ return (int) (f * ((float) getResources().getDisplayMetrics().densityDpi / 160.0f)); } 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 5760ac731..33974a17f 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -100,31 +100,6 @@ public class Newsfeed{ } } // Get needed filter list from assets - public static boolean injectFilters(JSONObject obj) throws JSONException{ - var optString = obj.optString("type", ""); - if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isRecomsGroup(optString) || isMusicBlock(optString) || isNewsBlock(optString)) { - return false; - } - optString = obj.optString("post_type", ""); - if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isMusicBlock(optString) || isNewsBlock(optString)) { - return false; - } - optString = obj.optString("filters", ""); - if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString)) { - return false; - } - - if (checkCopyright(obj)) return false; - - if (isBadNew(obj.optString("text", ""))) return false; - - if (checkCaption(obj)) return false; - - if (isGroupAds(obj)) return false; - - return !injectFiltersReposts(obj); - } // inject our filters to newsfeed, getpost and discover - public static boolean injectFiltersReposts(JSONObject obj){ if (obj.optJSONArray("copy_history") == null) return false; @@ -143,7 +118,7 @@ public class Newsfeed{ return isBadNew(Array); } // get repost information and inject our text filters - private static boolean checkCopyright(JSONObject json) throws JSONException{ + public static boolean checkCopyright(JSONObject json) throws JSONException{ if (json.opt("copyright") != null) { var copyright = json.getJSONObject("copyright"); var copyrightlink = copyright.getString("link"); @@ -158,15 +133,15 @@ public class Newsfeed{ return false; } - private static boolean isRecomsGroup(String src){ + public static boolean isRecomsGroup(String src){ return src.equals("recommended_groups") && authorsrecomm(); } - private static boolean isMusicBlock(String src){ + public static boolean isMusicBlock(String src){ return (src.equals("recommended_audios") || src.equals("recommended_artists") || src.equals("recommended_playlists")) && authorsrecomm(); } - private static boolean isNewsBlock(String src){ + public static boolean isNewsBlock(String src){ return (src.equals("tags_suggestions")) && Preferences.ads(); } @@ -227,70 +202,4 @@ public class Newsfeed{ public static boolean isGroupAds(JSONObject obj){ return (obj.optInt("marked_as_ads", 0) == 1) && adsgroup(); } - - public static String storyads(){ - return adsstories() ? "null" : "ads"; - } - - public static long getUpdateNewsfeed(boolean refresh_timeout){ - if (vkme()) { - return MAX_VALUE; - } - switch(getPrefsValue("newsupdate")) { - case "no_update": - return MAX_VALUE; - case "imd_update": - return 10000L; - default: - return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); - } - } - - public static Class getStartFragment(){ - if (vkme()) { - return DialogsFragment.class; - } - switch(getPrefsValue("start_values")) { - case "newsfeed": - return milkshake() ? HomeFragment.class : NewsfeedFragment.class; - case "messenger": - return DialogsFragment.class; - case "groups": - return milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class; - case "music": - return getBoolValue("musicnewcatalog", true) ? MusicCatalogFragment1.class : MusicFragment.class; - case "friends": - return FriendsFragment.class; - case "photos": - return PhotosFragment.class; - case "videos": - return VideosFragment.class; - case "settings": - return useNewSettings(); - case "apps": - return AppsFragment.class; - case "discover": - return ThemedFeedFragment.class; - case "notifications": - return NotificationsContainerFragment.class; - case "money": - return MoneyTransfersFragment.class; - case "games": - return GamesFragment.class; - case "liked": - return FaveTabFragment.class; - case "menu": - return milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : MenuFragment.class; - case "profile": - return ProfileFragment.class; - case "lives": - return LivesTabsFragment.class; - case "docs": - return DocumentsViewFragment.class; - case "brtd": - return BirthdaysFragment.class; - default: - return getInstance().getSelectedTabs().get(0).fragmentClass; - } - } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/OpusLoader.java b/app/src/main/java/ru/vtosters/lite/utils/OpusLoader.java deleted file mode 100644 index 9cd61d189..000000000 --- a/app/src/main/java/ru/vtosters/lite/utils/OpusLoader.java +++ /dev/null @@ -1,61 +0,0 @@ -package ru.vtosters.lite.utils; - -import static ru.vtosters.lite.utils.Preferences.dev; -import static ru.vtosters.lite.utils.Preferences.opusmodule; - -import android.util.Log; - -import com.vk.medianative.MediaNative; - -import java.nio.ByteBuffer; - -public class OpusLoader{ - private static long timetracker; - private static boolean inited; - - public static void LoadLibrary(String libname){ - try { - System.loadLibrary(libname); - inited = true; - } catch (UnsatisfiedLinkError unused2) { - if (dev()) Log.d("VTLite", "Failed to load " + libname); - inited = false; - } - } - - public static long getLength(){ - if (isReadyToUse()) { - long length = System.currentTimeMillis() - timetracker; - timetracker = System.currentTimeMillis(); - return length; - } - return 0L; - } - - public static int AudioStartRecordBridge(String str){ - if (isReadyToUse()) { - // Init custom AudioStartRecord - timetracker = System.currentTimeMillis(); - return 1; - } - return MediaNative.audioStartRecord(str); - } - - public static int AudioWriteFrameBridge(ByteBuffer buffer, int length){ - if (isReadyToUse()) { - // Init custom AudioWriteFrame - } - return MediaNative.audioWriteFrame(buffer, length); - } - - public static void AudioStopRecordBridge(){ - if (isReadyToUse()) { - // Init custom AudioStopRecord - } - MediaNative.audioStopRecord(); - } - - private static boolean isReadyToUse(){ - return opusmodule() && inited; - } -} 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 a4bd26090..b43079c02 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java @@ -7,39 +7,6 @@ import static ru.vtosters.lite.utils.Globals.getPrefsValue; import android.util.Log; public class Proxy{ - public static String linkReplacer(String link){ - var vkapi = "api.vk.com"; - var oauth = "oauth.vk.com"; - var vkstatic = "static.vk.com"; - - var proxyapi = getPrefsValue("proxyapi"); - var proxyoauth = getPrefsValue("proxyoauth"); - var proxystatic = getPrefsValue("proxystatic"); - - if (!apiproxy() || link.isEmpty()) { - return link; - } - - if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) { - Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic); - return link; - } - - if (link.contains(vkapi)) { - return link.replace(proxyapi, vkapi); - } - - if (link.contains(oauth)) { - return link.replace(proxyoauth, oauth); - } - - if (link.contains(vkstatic)) { - return link.replace(proxystatic, vkstatic); - } - - return link; - } - public static String getApi(){ var proxyapi = getPrefsValue("proxyapi"); @@ -50,16 +17,6 @@ public class Proxy{ return "api.vk.com"; } - public static String getAwayPhpCom(){ - var proxyapi = getPrefsValue("proxyapi"); - - if (apiproxy() & !proxyapi.isEmpty()) { - return proxyapi; - } - - return "m.vk.com"; - } - public static Boolean isZaboronaEnabled(){ return getPrefsValue("proxy").equals("zaborona"); } diff --git a/app/src/main/java/ru/vtosters/lite/utils/SSFS.java b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java index 4be431ff2..d1b1fe6bf 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/SSFS.java +++ b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java @@ -1,10 +1,10 @@ package ru.vtosters.lite.utils; +import static ru.vtosters.lite.hooks.DateHook.getLocale; import static ru.vtosters.lite.utils.About.getBuildNumber; import static ru.vtosters.lite.utils.Globals.getPrefsValue; import static ru.vtosters.lite.utils.Globals.getUserSecret; import static ru.vtosters.lite.utils.Globals.getUserToken; -import static ru.vtosters.lite.utils.LocaleUtils.getLocale; import static ru.vtosters.lite.utils.Preferences.dev; import static ru.vtosters.lite.utils.Preferences.vksans; import static ru.vtosters.lite.utils.Proxy.apiproxy; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index a61c852f8..163c3a8b1 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.utils; import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; +import static ru.vtosters.lite.hooks.VKUIHook.isLoaded; import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper; import static ru.vtosters.lite.utils.Globals.edit; import static ru.vtosters.lite.utils.Globals.getCenterScreenCoords; @@ -8,14 +9,11 @@ import static ru.vtosters.lite.utils.Globals.getCurrentActivity; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; import static ru.vtosters.lite.utils.Globals.getResources; -import static ru.vtosters.lite.utils.Globals.sendToast; import static ru.vtosters.lite.utils.Preferences.color_grishka; import static ru.vtosters.lite.utils.Preferences.milkshake; import static ru.vtosters.lite.utils.Preferences.navbar; import static ru.vtosters.lite.utils.Preferences.systemtheme; import static ru.vtosters.lite.utils.Preferences.vkme; -import static ru.vtosters.lite.utils.ReflectionUtils.getField; -import static ru.vtosters.lite.utils.VKUIInjector.isLoaded; import android.annotation.SuppressLint; import android.app.Activity; @@ -50,6 +48,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import kotlin.u.KProperty5; +import ru.vtosters.lite.hooks.VKUIHook; public class Themes{ public static List accentColors = Arrays.asList( 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 51c2c7d52..64df05ebd 100644 --- a/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali +++ b/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali @@ -103,7 +103,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -123,7 +123,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->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 853b05866..243d92b16 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 {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->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 {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 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 39d50f796..7316fad1e 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,7 +122,7 @@ move-result-object v10 - invoke-static {v10}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v10}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v11 @@ -539,7 +539,7 @@ move-object/from16 v21, v5 - invoke-static {v13}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v13}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v16 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 a1b0d8913..ab696dd1a 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali @@ -65,7 +65,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v2}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 @@ -242,7 +242,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v2}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 diff --git a/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali b/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali index d939961dc..25f7a6822 100644 --- a/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali +++ b/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali @@ -137,7 +137,7 @@ const-string v4, "receipt" - invoke-static {v3}, Lru/vtosters/lite/audio/gcm/GCMFix;->requestToken(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/GcmHook;->requestToken(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -169,7 +169,7 @@ const-string v5, "receipt2" - invoke-static {v4}, Lru/vtosters/lite/audio/gcm/GCMFix;->requestTokenV2(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/GcmHook;->requestTokenV2(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 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 14000bb32..866aa4178 100644 --- a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali +++ b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali @@ -71,7 +71,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->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 04a3ba1ec..66da43a0d 100644 --- a/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali +++ b/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali @@ -114,7 +114,7 @@ const-string v3, "https://oauth.vk.com/blank.html" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali index 263a57a03..1eada947e 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali @@ -335,7 +335,7 @@ .method public onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V .locals 0 - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/utils/VKUIInjector;->inject(Landroid/webkit/WebView;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V .line 1 invoke-super {p0, p1, p2}, Landroid/webkit/WebViewClient;->onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V 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 0ac9fd16e..176b8f987 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali @@ -202,7 +202,7 @@ :cond_0 const-string v0, "https://oauth.vk.com/authorize" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali index 5d468b13c..de38f6314 100644 --- a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali +++ b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali @@ -21,7 +21,7 @@ const-string v1, "{\"response\":{\"catalog_version\":11,\"filters\":{\"count\":9,\"items\":[{\"id\":\"snow\",\"app_version\":\"v2.0.0(14077)\",\"preset\":{\"col\":[{\"lumAdj\":0.036000,\"satAdj\":0.145000,\"sm\":0.350000,\"fG\":0.500000,\"fB\":0.500000,\"thr\":0.350000,\"fR\":0.500000,\"hue\":0},{\"lumAdj\":0.099000,\"satAdj\":0,\"sm\":0.350000,\"fG\":1,\"fB\":1,\"thr\":0.034000,\"fR\":1,\"hue\":0.567000},{\"lumAdj\":0.061000,\"satAdj\":0.860000,\"sm\":0.224000,\"fG\":0.451000,\"fB\":0.451000,\"thr\":0.069000,\"fR\":1,\"hue\":0.057000},{\"lumAdj\":0,\"satAdj\":0.224000,\"sm\":0.111000,\"fG\":0,\"fB\":0,\"thr\":0.051000,\"fR\":0.702000,\"hue\":0.018000},{\"lumAdj\":-0.038000,\"satAdj\":0.136000,\"sm\":0.332000,\"fG\":0,\"fB\":0,\"thr\":0.177000,\"fR\":1,\"hue\":0.018000},{\"lumAdj\":0.111000,\"satAdj\":0.864000,\"sm\":0.348000,\"fG\":1,\"fB\":1,\"thr\":0.071000,\"fR\":0,\"hue\":0.572000},{\"lumAdj\":-0.069000,\"satAdj\":0.178000,\"sm\":0.068000,\"fG\":0,\"fB\":0,\"thr\":0,\"fR\":0,\"hue\":0.949000}],\"red_curve\":[0,64,128,192,255],\"sat\":-0.025000,\"con\":-0.299000,\"green_curve\":[0,64,128,192,255],\"blue_curve\":[0,64,128,192,255],\"rgb_curve\":[0,57,132,194,255],\"br\":-0.102000,\"enh\":0.399000,\"tint\":-0.138000},\"name\":\"Snow\",\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/snow@2x.jpg?3\"},{\"id\":\"lake\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.018145,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.441830,\"lumAdj\":-0.095000,\"satAdj\":0.311000,\"sm\":0.264000,\"thr\":0.185000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.021000,\"satAdj\":0.000000,\"sm\":0.350000,\"thr\":0.409000},{\"fB\":0.176000,\"fG\":0.192000,\"fR\":0.243000,\"hue\":0.662092,\"lumAdj\":-0.003000,\"satAdj\":0.122984,\"sm\":0.146000,\"thr\":0.026000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":0.418954,\"lumAdj\":-0.035685,\"satAdj\":-0.012097,\"sm\":0.311000,\"thr\":0.120000},{\"fB\":0.600000,\"fG\":1.000000,\"fR\":0.992000,\"hue\":0.170000,\"lumAdj\":0.023000,\"satAdj\":-0.347000,\"sm\":0.271000,\"thr\":0.130000},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":0.022000,\"lumAdj\":0.021000,\"satAdj\":0.250000,\"sm\":0.255000,\"thr\":0.087000},{\"fB\":0.424000,\"fG\":0.525000,\"fR\":0.765000,\"hue\":0.069935,\"lumAdj\":0.040524,\"satAdj\":-0.177419,\"sm\":0.129486,\"thr\":0.038199},{\"fB\":0.188000,\"fG\":0.220000,\"fR\":0.329000,\"hue\":0.037000,\"lumAdj\":-0.016000,\"satAdj\":0.333000,\"sm\":0.097000,\"thr\":0.006000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.350980,\"lumAdj\":0.061000,\"satAdj\":0.052000,\"sm\":0.319000,\"thr\":0.009000}],\"con\":0.119000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,71,134,192,255],\"sat\":0.370968,\"shar\":0.000000,\"tem\":-0.415000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Lake\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/lake@2x.jpg?3\"},{\"id\":\"dew\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.505000,\"lumAdj\":-0.041000,\"satAdj\":0.089000,\"sm\":0.194000,\"thr\":0.039000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.108000,\"lumAdj\":-0.031000,\"satAdj\":-0.084000,\"sm\":0.350000,\"thr\":0.096000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.071895,\"lumAdj\":-0.031000,\"satAdj\":0.038000,\"sm\":0.172000,\"thr\":0.243000},{\"fB\":0.000000,\"fG\":0.549000,\"fR\":0.012000,\"hue\":0.506000,\"lumAdj\":-0.096000,\"satAdj\":1.000000,\"sm\":0.204000,\"thr\":0.096000},{\"fB\":0.451000,\"fG\":0.427000,\"fR\":0.467000,\"hue\":0.900000,\"lumAdj\":0.000000,\"satAdj\":0.190000,\"sm\":0.030000,\"thr\":0.000000},{\"fB\":0.431000,\"fG\":0.420000,\"fR\":0.392000,\"hue\":0.550000,\"lumAdj\":0.000000,\"satAdj\":0.482000,\"sm\":0.077000,\"thr\":0.002000},{\"fB\":0.780000,\"fG\":0.792000,\"fR\":0.745000,\"hue\":0.542000,\"lumAdj\":0.000000,\"satAdj\":-1.000000,\"sm\":0.297000,\"thr\":0.003000},{\"fB\":0.200000,\"fG\":0.200000,\"fR\":0.200000,\"hue\":0.966013,\"lumAdj\":-0.029032,\"satAdj\":0.098790,\"sm\":0.350000,\"thr\":0.023000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.837908,\"lumAdj\":-0.001000,\"satAdj\":0.216000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":1.000000,\"fG\":0.835000,\"fR\":0.690000,\"hue\":0.480000,\"lumAdj\":-0.110000,\"satAdj\":0.201000,\"sm\":0.086000,\"thr\":0.002000},{\"fB\":0.490000,\"fG\":0.659000,\"fR\":0.698000,\"hue\":0.022000,\"lumAdj\":-0.002000,\"satAdj\":0.318000,\"sm\":0.307000,\"thr\":0.028000},{\"fB\":0.478000,\"fG\":0.592000,\"fR\":0.835000,\"hue\":0.053000,\"lumAdj\":0.108000,\"satAdj\":0.333000,\"sm\":0.221000,\"thr\":0.004000},{\"fB\":0.886000,\"fG\":0.612000,\"fR\":0.380000,\"hue\":0.476000,\"lumAdj\":-0.052000,\"satAdj\":0.571000,\"sm\":0.155000,\"thr\":0.010000}],\"con\":0.000000,\"localCurrentColor\":8,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.007000},\"isDisabled\":false,\"name\":\"Dew\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dew@2x.jpg?3\"},{\"id\":\"ash\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.027000,\"satAdj\":-0.636000,\"sm\":0.348000,\"thr\":0.018000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.032026,\"lumAdj\":-0.041129,\"satAdj\":0.100806,\"sm\":0.348000,\"thr\":0.138000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.167320,\"lumAdj\":-0.062298,\"satAdj\":0.062500,\"sm\":0.256000,\"thr\":0.000000},{\"fB\":0.561000,\"fG\":0.651000,\"fR\":0.745000,\"hue\":0.104000,\"lumAdj\":-0.025000,\"satAdj\":0.309000,\"sm\":0.092000,\"thr\":0.019000},{\"fB\":0.149000,\"fG\":0.149000,\"fR\":0.149000,\"hue\":0.986000,\"lumAdj\":-0.043000,\"satAdj\":0.206000,\"sm\":0.188000,\"thr\":0.008000},{\"fB\":0.961000,\"fG\":0.631000,\"fR\":0.412000,\"hue\":0.535294,\"lumAdj\":0.000000,\"satAdj\":0.989919,\"sm\":0.202000,\"thr\":0.000000}],\"con\":0.000000,\"localCurrentColor\":5,\"enh\":0.179000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Ash\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/ash@2x.jpg?3\"},{\"id\":\"fen\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.058000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.044000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.032000,\"satAdj\":0.000000,\"sm\":0.344000,\"thr\":0.358000},{\"fB\":0.176000,\"fG\":0.196000,\"fR\":0.294000,\"hue\":0.030065,\"lumAdj\":-0.019000,\"satAdj\":0.336000,\"sm\":0.037000,\"thr\":0.000000},{\"fB\":0.200000,\"fG\":0.216000,\"fR\":0.235000,\"hue\":0.601307,\"lumAdj\":-0.047177,\"satAdj\":0.133065,\"sm\":0.095000,\"thr\":0.006000},{\"fB\":0.780000,\"fG\":0.471000,\"fR\":0.329000,\"hue\":0.437255,\"lumAdj\":0.000000,\"satAdj\":0.344758,\"sm\":0.150000,\"thr\":0.031000}],\"con\":-0.516000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.163000,\"gr\":0.000000,\"green_curve\":[0,65,124,192,255],\"red_curve\":[0,65,126,192,255],\"rgb_curve\":[0,42,119,185,249],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Fen\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/fen@2x.jpg?3\"},{\"id\":\"drama\",\"date\":0,\"preset\":{\"blue_curve\":[0,62,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.153000,\"fG\":0.180000,\"fR\":0.337000,\"hue\":0.025000,\"lumAdj\":0.000000,\"satAdj\":0.284000,\"sm\":0.103000,\"thr\":0.021000},{\"fB\":0.537000,\"fG\":0.565000,\"fR\":0.804000,\"hue\":0.016993,\"lumAdj\":0.037500,\"satAdj\":0.161290,\"sm\":0.108000,\"thr\":0.010000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.031452,\"satAdj\":0.800403,\"sm\":0.338004,\"thr\":0.038588},{\"fB\":0.549000,\"fG\":0.631000,\"fR\":0.824000,\"hue\":1.000000,\"lumAdj\":0.058669,\"satAdj\":0.175403,\"sm\":0.155000,\"thr\":0.035000},{\"fB\":0.270588,\"fG\":0.270588,\"fR\":0.325490,\"hue\":1.000000,\"lumAdj\":0.059879,\"satAdj\":0.008065,\"sm\":0.083266,\"thr\":0.008340}],\"con\":0.054435,\"localCurrentColor\":6,\"enh\":0.163306,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,60,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,49,118,196,255],\"sat\":-0.514113,\"shar\":0.000000,\"tem\":-0.328000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Drama\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/drama@2x.jpg?3\"},{\"id\":\"sunset\",\"date\":1457719798,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.004032,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.533000,\"lumAdj\":-0.177000,\"satAdj\":-0.234000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.570000,\"lumAdj\":-0.052000,\"satAdj\":0.201000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.596078,\"lumAdj\":0.000000,\"satAdj\":0.252000,\"sm\":0.203000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.400000,\"hue\":0.985000,\"lumAdj\":-0.069000,\"satAdj\":0.276000,\"sm\":0.100000,\"thr\":0.057000},{\"fB\":0.400000,\"fG\":0.000000,\"fR\":0.008000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.108871,\"sm\":0.150000,\"thr\":0.100000},{\"fB\":0.043000,\"fG\":0.090000,\"fR\":0.153000,\"hue\":0.041000,\"lumAdj\":-0.036000,\"satAdj\":0.327000,\"sm\":0.059000,\"thr\":0.000000},{\"fB\":0.945000,\"fG\":0.961000,\"fR\":0.961000,\"hue\":0.580000,\"lumAdj\":0.119000,\"satAdj\":0.584000,\"sm\":0.114000,\"thr\":0.000000},{\"fB\":0.333000,\"fG\":0.506000,\"fR\":0.725000,\"hue\":0.083000,\"lumAdj\":0.018000,\"satAdj\":0.679000,\"sm\":0.173000,\"thr\":0.067000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":1.000000,\"lumAdj\":-0.059000,\"satAdj\":0.163000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.619000,\"lumAdj\":-0.013000,\"satAdj\":0.000000,\"sm\":0.177000,\"thr\":0.053000}],\"con\":0.268145,\"localCurrentColor\":3,\"enh\":0.157258,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-0.155000,\"shar\":0.250000,\"tem\":-0.488510,\"tint\":-0.186000,\"vig\":0.293000},\"isDisabled\":false,\"name\":\"Sunset\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/sunset@2x.jpg?3\"},{\"id\":\"downpour\",\"date\":1457719647,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.560131,\"lumAdj\":-0.047177,\"satAdj\":0.107000,\"sm\":0.157000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.026797,\"lumAdj\":-0.034476,\"satAdj\":0.320564,\"sm\":0.200000,\"thr\":0.243000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.466013,\"lumAdj\":-0.020565,\"satAdj\":0.092742,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.247000,\"fG\":0.416000,\"fR\":0.580000,\"hue\":0.090196,\"lumAdj\":-0.035081,\"satAdj\":0.391129,\"sm\":0.186290,\"thr\":0.008739},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.549020,\"lumAdj\":-0.032661,\"satAdj\":0.252000,\"sm\":0.233216,\"thr\":0.003378},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.532680,\"lumAdj\":0.000000,\"satAdj\":-0.285000,\"sm\":0.200000,\"thr\":0.038000},{\"fB\":0.137255,\"fG\":0.133333,\"fR\":0.105882,\"hue\":1.000000,\"lumAdj\":-0.053831,\"satAdj\":0.308468,\"sm\":0.185585,\"thr\":0.000624},{\"fB\":0.470588,\"fG\":0.529412,\"fR\":0.639216,\"hue\":0.058170,\"lumAdj\":0.095565,\"satAdj\":0.118952,\"sm\":0.221573,\"thr\":0.018977}],\"con\":-0.143145,\"localCurrentColor\":8,\"enh\":0.146169,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,62,141,205,255],\"sat\":-0.348790,\"shar\":0.232000,\"tem\":-0.314516,\"tint\":-0.135000,\"vig\":0.008000},\"isDisabled\":false,\"name\":\"Downpour\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/downpour@2x.jpg?3\"},{\"id\":\"dark\",\"date\":1457715727,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":-0.107500,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.211694,\"satAdj\":-0.629032,\"sm\":0.349647,\"thr\":0.761176},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.549000,\"hue\":1.000000,\"lumAdj\":0.168750,\"satAdj\":0.000000,\"sm\":0.325302,\"thr\":0.814856},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.091000,\"satAdj\":0.000000,\"sm\":0.163000,\"thr\":0.129000},{\"fB\":0.914000,\"fG\":0.761000,\"fR\":0.612000,\"hue\":0.584000,\"lumAdj\":-0.121000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.102000,\"fG\":0.102000,\"fR\":0.102000,\"hue\":1.000000,\"lumAdj\":0.052000,\"satAdj\":0.000000,\"sm\":0.287000,\"thr\":0.000000},{\"fB\":0.647059,\"fG\":0.745098,\"fR\":0.968627,\"hue\":0.050980,\"lumAdj\":0.137903,\"satAdj\":0.000000,\"sm\":0.340474,\"thr\":0.156163}],\"con\":0.295000,\"localCurrentColor\":7,\"enh\":0.212000,\"fade\":0.028000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-1.000000,\"shar\":0.240000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Dark\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dark@2x.jpg?3\"}]},\"instagram_suffix\":\"\",\"instagram_fallback\":0}}" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali index 4e5c966fd..a8fc02642 100644 --- a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali +++ b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali @@ -47,7 +47,7 @@ const-string v1, "static.vk.com/restore" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali index ffe337794..dbeca25f7 100644 --- a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali +++ b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali @@ -657,7 +657,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali b/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali index 18fb81361..42139135b 100644 --- a/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali +++ b/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali @@ -210,7 +210,7 @@ invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-static {p2}, Lru/vtosters/lite/utils/ProxyHook;->hookAuth(Landroid/view/View;)V + invoke-static {p2}, Lru/vtosters/lite/hooks/ProxyHook;->hookAuth(Landroid/view/View;)V .line 7 invoke-direct {p0}, Lcom/vk/auth/w/a/ChooseAuthMethodFragment;->K4()V 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 b8489c7e2..4e2dca9ef 100644 --- a/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali +++ b/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali @@ -56,7 +56,7 @@ const-string v0, "oauth.vk.com" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali index 09c555b6d..5baa638a4 100644 --- a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali +++ b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali @@ -166,7 +166,7 @@ const-string v2, "https://static.vk.com/promo_codes/" - invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali index 1f9384533..acb6a2ee6 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali @@ -107,7 +107,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/utils/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali index ecd4e64e5..855ad8472 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali @@ -79,7 +79,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/utils/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 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 bbe9d0c11..15b6c36e3 100644 --- a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali +++ b/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali @@ -640,7 +640,7 @@ const-string v0, "" :goto_0 - invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getAwayPhpCom()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/hooks/ProxyHook;->getAwayPhpCom()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali b/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali index f34387aeb..8cefc1d04 100644 --- a/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali +++ b/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali @@ -219,7 +219,7 @@ .method private final a(ZJ)Ljava/lang/String; .locals 2 - invoke-static {p1, p2, p3}, Lru/vtosters/lite/utils/LocaleUtils;->getFormattedDate(ZJ)Ljava/lang/String; + invoke-static {p1, p2, p3}, Lru/vtosters/lite/hooks/DateHook;->getFormattedDate(ZJ)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali index c3e6cb3b7..a66214371 100644 --- a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali +++ b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali @@ -186,7 +186,7 @@ if-eqz v0, :cond_0 - invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)Z + invoke-static {v0}, Lru/vtosters/lite/hooks/FragAnimationHook;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)Z move-result v1 @@ -355,7 +355,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateClose(Landroidx/fragment/app/FragmentTransaction;)V + invoke-static {v0}, Lru/vtosters/lite/hooks/FragAnimationHook;->animateClose(Landroidx/fragment/app/FragmentTransaction;)V iput-object v0, p0, Lcom/vk/core/fragments/j/b/ParentSupportFragmentManager;->b:Landroidx/fragment/app/FragmentTransaction; 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 2138786b8..d876d288d 100644 --- a/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali +++ b/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali @@ -187,7 +187,7 @@ const-string v3, "https://api.vk.com/method/execute" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali index 5951663cf..561287a19 100644 --- a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali @@ -38,7 +38,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/menu/MenuResponse; .locals 9 - invoke-static {p1}, Lru/vtosters/lite/utils/JsonInjectors;->menu(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->menu(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali b/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali index 5dc171c17..4e64a7b50 100644 --- a/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali @@ -181,7 +181,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/menu/SuperAppMenuResponse; .locals 9 - invoke-static {p1}, Lru/vtosters/lite/utils/JsonInjectors;->superapp(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->superapp(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali b/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali index 9e1d268df..03044f946 100644 --- a/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali +++ b/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali @@ -309,7 +309,7 @@ invoke-static {v5, v6, v2, v3}, Lcom/vk/dto/stories/model/GetStoriesResponse;->a(Lorg/json/JSONArray;Ljava/util/Collection;Landroid/util/SparseArray;Landroid/util/SparseArray;)V - invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->storyads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/hooks/StoriesHook;->ads()Ljava/lang/String; move-result-object v5 diff --git a/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali b/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali index d197194a8..24263ac36 100644 --- a/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali +++ b/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali @@ -342,7 +342,7 @@ .line 1 iget v1, p0, Lcom/vk/dto/user/VisibleStatus;->c:I - invoke-static {v1}, Lru/vtosters/lite/utils/OnlineFormatter;->getOnline(I)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->getOnline(I)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali index 976e99432..369239d07 100644 --- a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali +++ b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali @@ -275,7 +275,7 @@ const-string v3, "api.vk.com" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali index 562640c37..e627f9416 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali @@ -622,7 +622,7 @@ move-result-object v4 - invoke-static {v1}, Lru/vtosters/lite/utils/JsonInjectors;->convBar(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v1}, Lru/vtosters/lite/hooks/JsonInjectors;->convBar(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v6 diff --git a/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali b/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali index fcd08cbff..80df698b6 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali @@ -45,7 +45,7 @@ invoke-direct {p1, v0}, Ljava/text/SimpleDateFormat;->(Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/LocaleUtils;->setDateFormat()Ljava/text/SimpleDateFormat; + invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->setDateFormat()Ljava/text/SimpleDateFormat; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali index 457828d9d..f94f9c665 100644 --- a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali +++ b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali @@ -244,7 +244,7 @@ .line 6 invoke-static {v0, p1}, Lcom/vk/core/ui/themes/VKThemeHelper;->b(Landroid/app/Activity;[F)V - invoke-static {}, Lru/vtosters/lite/utils/Globals;->clearWebCache()V + invoke-static {}, Lru/vtosters/lite/hooks/VKUIHook;->clearWebCache()V :cond_0 return-void diff --git a/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali b/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali index 272aa5cfa..d6bdb419c 100644 --- a/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali +++ b/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali @@ -1176,7 +1176,7 @@ .method private final b(Lcom/vk/dto/stories/model/GetStoriesResponse;)V .locals 4 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->stories()Z + invoke-static {}, Lru/vtosters/lite/hooks/StoriesHook;->showstories()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali index c31999186..25d1712a0 100644 --- a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali +++ b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali @@ -756,7 +756,7 @@ :goto_5 invoke-virtual {v0, v2}, Landroid/widget/TextView;->setVisibility(I)V - invoke-static {p0}, Lru/vtosters/lite/utils/PollUtils;->show(Lcom/vk/polls/ui/views/PollOptionView;)V + invoke-static {p0}, Lru/vtosters/lite/hooks/PollHook;->show(Lcom/vk/polls/ui/views/PollOptionView;)V .line 18 iget-object v0, p0, Lcom/vk/polls/ui/views/PollOptionView;->c:Landroid/widget/TextView; 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 58fa86616..8a9047afd 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali +++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali @@ -56,7 +56,7 @@ const-string v4, "static.vk.com" - invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali index 2ee899efa..e3df62f13 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali +++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali @@ -84,7 +84,7 @@ const-string v4, "static.vk.com" - invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/toggle/FeatureManager.smali b/smali/smali_classes4/com/vk/toggle/FeatureManager.smali index 1a5c2f41a..7bbb679eb 100644 --- a/smali/smali_classes4/com/vk/toggle/FeatureManager.smali +++ b/smali/smali_classes4/com/vk/toggle/FeatureManager.smali @@ -558,13 +558,13 @@ .method public static final declared-synchronized b(Lcom/vk/toggle/Features$Type;)Z .locals 2 - invoke-static {p0}, Lru/vtosters/lite/utils/Toggles;->shouldPatch(Lcom/vk/toggle/Features$Type;)Z + invoke-static {p0}, Lru/vtosters/lite/hooks/TogglesHook;->shouldPatch(Lcom/vk/toggle/Features$Type;)Z move-result v0 if-eqz v0, :cond_b - invoke-static {p0}, Lru/vtosters/lite/utils/Toggles;->redirect(Lcom/vk/toggle/Features$Type;)Z + invoke-static {p0}, Lru/vtosters/lite/hooks/TogglesHook;->redirect(Lcom/vk/toggle/Features$Type;)Z move-result p0 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali index 33a811825..73b52c6da 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali +++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali @@ -132,7 +132,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali index 5d7728c42..01014db67 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali +++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali @@ -1217,7 +1217,7 @@ const-string v3, "static.vk.com" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -1968,7 +1968,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->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 01ca835b5..8524aa004 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali +++ b/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali @@ -1491,7 +1491,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p1 @@ -1585,7 +1585,7 @@ const-string p3, "https://oauth.vk.com/authorize" - invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p3 diff --git a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali index 0422f4edc..9decc0b58 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali +++ b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali @@ -240,7 +240,7 @@ move-result-object p3 - invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p3 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali index 8dcb6b580..d522bc7c3 100644 --- a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali +++ b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali @@ -182,7 +182,7 @@ .line 16 :goto_0 - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali index 8007ec6a4..e2a57e47e 100644 --- a/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali +++ b/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali @@ -300,7 +300,7 @@ .method public onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V .locals 3 - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/utils/VKUIInjector;->inject(Landroid/webkit/WebView;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V const/4 v0, 0x2 diff --git a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali index c4a95752f..795e530c7 100644 --- a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali @@ -121,7 +121,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; move-result-object p2 @@ -639,7 +639,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali index 746f34c50..162c44c2b 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali +++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali @@ -97,7 +97,7 @@ const-string v4, "oauth.vk.com" - invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali index a0134935a..4f9ecb3cb 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali @@ -207,7 +207,7 @@ const-string v4, "https://oauth.vk.com/blank.html" - invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -296,7 +296,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali index b9a069bea..fa33c5ac1 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali @@ -82,7 +82,7 @@ .line 3 :goto_0 - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali index 613fbce7b..18d169a2c 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali @@ -3016,7 +3016,7 @@ new-instance v0, Ljava/text/SimpleDateFormat; - invoke-static {}, Lru/vtosters/lite/utils/LocaleUtils;->getDateFormat()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->getDateFormat()Ljava/lang/String; move-result-object v3 @@ -3032,7 +3032,7 @@ .param p0, "s" # I .line 17 - invoke-static {}, Lru/vtosters/lite/utils/LocaleUtils;->fulltime()Z + invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->fulltime()Z move-result v0 diff --git a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali index 4c4865c5f..d19aa5770 100644 --- a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali @@ -326,7 +326,7 @@ const-string v3, "oauth.vk.com" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali index 991669f4a..d39e6e157 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali @@ -208,7 +208,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -305,7 +305,7 @@ const-string v3, "api.vk.com" - invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes4/com/vtosters/lite/api/ExtendedUserProfile$d.smali b/smali/smali_classes4/com/vtosters/lite/api/ExtendedUserProfile$d.smali index e9dc70076..e84086259 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/ExtendedUserProfile$d.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/ExtendedUserProfile$d.smali @@ -39,7 +39,7 @@ .method public static a(Lorg/json/JSONObject;)Lcom/vtosters/lite/api/ExtendedUserProfile$d; .locals 3 - invoke-static {p0}, Lru/vtosters/lite/utils/JsonInjectors;->profileButton(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p0}, Lru/vtosters/lite/hooks/JsonInjectors;->profileButton(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p0 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali index 87ba2f15c..00e856ab8 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali @@ -131,7 +131,7 @@ move-result-object v7 - invoke-static {v7}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v7}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 @@ -179,7 +179,7 @@ move-result-object v6 - invoke-static {v6}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v6}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 @@ -223,7 +223,7 @@ move-result-object p3 - invoke-static {p3}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {p3}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali index 778bb0f9e..03430053d 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali @@ -767,7 +767,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v2}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 @@ -834,7 +834,7 @@ .method public static c(Z)J .locals 3 - invoke-static {p0}, Lru/vtosters/lite/utils/Newsfeed;->getUpdateNewsfeed(Z)J + invoke-static {p0}, Lru/vtosters/lite/hooks/NewsfeedHook;->getUpdateNewsfeed(Z)J move-result-wide v0 diff --git a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali index 6d14ab739..b826c7e9e 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali @@ -535,7 +535,7 @@ move-result-object v8 - invoke-static {v8}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + invoke-static {v8}, Lru/vtosters/lite/hooks/NewsfeedHook;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 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 8cc503cca..66584e173 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali @@ -68,7 +68,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali index 7b164cdea..bfa41bc28 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali @@ -305,7 +305,7 @@ :goto_5 const-string p2, "api.vk.com" - invoke-static {p2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/lite/hooks/ProxyHook;->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 6b6faa00f..c6c9b5fc2 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali @@ -1986,7 +1986,7 @@ const-string v1, "static.vk.com" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -2004,7 +2004,7 @@ const-string v2, "previous_oauth" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -2018,7 +2018,7 @@ const-string v1, "api.vk.com" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->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 3ef30980a..dac7985b7 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali @@ -40,7 +40,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -182,7 +182,7 @@ const-string v0, "https://oauth.vk.com/blank.html#state=webview_refresh_access_token" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali index 8283ba6da..1cfe78fd1 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali @@ -1025,7 +1025,7 @@ const-string v2, "https://oauth.vk.com/webview_token" - invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -1215,7 +1215,7 @@ const-string v0, "https://oauth.vk.com/webview_token" - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali index f091835d3..fd0ace6cd 100644 --- a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali +++ b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali @@ -70,7 +70,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0