From 1981bc9d14e112ba46d4ebca8d4a6ad33adcb9d2 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 20 Jul 2022 12:24:58 +0300 Subject: [PATCH] vkpay/games/miniapps hide feature --- .../java/ru/vtosters/lite/hooks/TogglesHook.java | 5 +++++ .../java/ru/vtosters/lite/utils/Preferences.java | 4 ++++ smali/res/xml/preferences_feed.xml | 4 ++++ smali/res/xml/preferences_interface.xml | 7 ++++++- .../com/vk/auth/api/VKAccount.smali | 4 ++++ .../com/vk/menu/MenuFragment.smali | 5 ++--- .../com/vk/menu/SearchMenuPresenter.smali | 16 ++++++++++++++-- 7 files changed, 39 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java index 738769926..08a221e91 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java @@ -1,4 +1,5 @@ package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.utils.Preferences.*; import static ru.vtosters.lite.utils.Preferences.feedcache; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.milkshake; @@ -9,6 +10,8 @@ import static ru.vtosters.lite.utils.Preferences.superapp; import com.vk.toggle.FeatureManager; import com.vk.toggle.Features; +import ru.vtosters.lite.utils.Preferences; + public class TogglesHook{ public static boolean shouldPatch(Features.Type feature){ switch(feature) { @@ -144,6 +147,8 @@ public class TogglesHook{ return !getBoolValue("compressPhotos", true); case FEATURE_MUSIC_STOP_PLAYER_ON_TASK_REMOVAL: return getBoolValue("musictask", false); + case FEATURE_MENU_GAMES_CAROUSEL: + return miniapps(); default: return true; } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index eb31cb9a5..f6ea9ce97 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -190,6 +190,10 @@ public class Preferences{ return getBoolValue("superapp", true); } + public static boolean vkpay(){ + return getBoolValue("vkpay", true); + } + public static boolean miniapps(){ return getBoolValue("miniapps", true); } diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 36a126765..e3b1b3e6f 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -98,6 +98,10 @@ android:key="officialnewssett" android:summary="@string/officialnewssett_summary" android:title="@string/officialnewssett" /> + + vkpay()Z + + move-result v0 + return v0 .end method diff --git a/smali/smali_classes3/com/vk/menu/MenuFragment.smali b/smali/smali_classes3/com/vk/menu/MenuFragment.smali index 723dee1bd..1ff890606 100644 --- a/smali/smali_classes3/com/vk/menu/MenuFragment.smali +++ b/smali/smali_classes3/com/vk/menu/MenuFragment.smali @@ -1319,9 +1319,6 @@ .line 4 invoke-direct {p0}, Lcom/vk/menu/MenuFragment;->a5()V - .line 5 - invoke-direct {p0}, Lcom/vk/menu/MenuFragment;->b5()V - .line 6 invoke-static {}, Lcom/vtosters/lite/auth/VKAccountManager;->d()Lcom/vk/auth/api/VKAccount; @@ -1336,6 +1333,8 @@ .line 7 invoke-direct {p0}, Lcom/vk/menu/MenuFragment;->Z4()V + invoke-direct {p0}, Lcom/vk/menu/MenuFragment;->b5()V + :cond_0 return-void .end method diff --git a/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali b/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali index ae2fcb18e..258879048 100644 --- a/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali +++ b/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali @@ -1319,16 +1319,28 @@ invoke-interface {v0, v2, v1}, Lcom/vk/menu/SearchMenuContract1;->d(ILjava/util/List;)V - .line 2 + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkpay()Z + + move-result v0 + + if-eqz v0, :cond_1 + invoke-direct {p0}, Lcom/vk/menu/SearchMenuPresenter;->g()V + :cond_1 + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->miniapps()Z + + move-result v0 + + if-eqz v0, :cond_0 + .line 3 invoke-direct {p0}, Lcom/vk/menu/SearchMenuPresenter;->e()V .line 4 invoke-direct {p0}, Lcom/vk/menu/SearchMenuPresenter;->f()V - .line 5 + :cond_0 invoke-static {}, Lcom/vk/core/ui/themes/VKThemeHelper;->n()I move-result v0