fixed crash in music + added disabler milkshake

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

@@ -219,6 +219,10 @@ public class Preferences{
         return getBoolValue("milkshake", true);
     }
 
+    public static boolean musicnewcatalog(){
+        return getBoolValue("musicnewcatalog", true);
+    }
+
     public static boolean returnnorifs(){
         return getBoolValue("returnnorifs", false);
     }

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

@@ -2,7 +2,7 @@ package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.Preferences.feedcache;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
-import static ru.vtosters.lite.utils.Preferences.returnnorifs;
+import static ru.vtosters.lite.utils.Preferences.musicnewcatalog;
 import static ru.vtosters.lite.utils.Preferences.superapp;
 
 import com.vk.toggle.FeatureManager;
@@ -36,12 +36,7 @@ public class Toggles{
             case FEATURE_MENU_GAMES_CAROUSEL:
             case FEATURE_MILKSHAKE:
             case FEATURE_MILKSHAKE_CHANGE_FEED_BY_TIMEOUT:
-            case FEATURE_MILKSHAKE_DISCOVER_IN_MENU:
-            case FEATURE_MILKSHAKE_FEED_BLUE_TITLE:
-            case FEATURE_MILKSHAKE_NEWS_HEADER_HIDE:
-            case FEATURE_MILKSHAKE_NEWS_HEADER_HIDE_SNAP:
             case FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK:
-            case FEATURE_MILKSHAKE_NOTIFICATIONS_RETURN:
             case FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP:
             case FEATURE_ML_BRANDS:
             case FEATURE_ML_FEATURES:
@@ -50,7 +45,6 @@ public class Toggles{
             case FEATURE_MOZJPEG:
             case FEATURE_MUSIC_ARTIST_CATALOG:
             case FEATURE_MUSIC_AUDIO_SERVICE:
-            case FEATURE_MUSIC_LIKE_IN_PLAYER:
             case FEATURE_MUSIC_NEW_CATALOG:
             case FEATURE_MUSIC_STOP_PLAYER_ON_TASK_REMOVAL:
             case FEATURE_MUS_PUSH_RES_COUNT:
@@ -115,7 +109,6 @@ public class Toggles{
             case FEATURE_STORY_WITH_CONTEXT:
             case FEATURE_SUPERAPP_MENU:
             case FEATURE_TRAFFIC_SAVER:
-            case FEATURE_VKPAY_PAY_WITH_QR:
             case FEATURE_VKPAY_WIDGET:
             case FEATURE_VKUI_INTERNAL_TO_MINI_APPS:
             case FEATURE_VKUI_TOKEN_CACHE:
@@ -125,6 +118,8 @@ public class Toggles{
             case FEATURE_WEBVIEW_TOKEN_ACTIVE:
             case FEATURE_WISHLIST_ENTRY_POINT:
             case FEATURE_WISHLIST_MY_PROFILE:
+            case FEATURE_MILKSHAKE_FORCE_DISABLED:
+            case FEATURE_MILKSHAKE_ACTIVATION_DISABLED:
                 return true;
             default:
                 return false;
@@ -138,8 +133,11 @@ public class Toggles{
                 return superapp();
             case FEATURE_MILKSHAKE:
                 return milkshake();
-            case FEATURE_MILKSHAKE_NOTIFICATIONS_RETURN:
-                return returnnorifs();
+            case FEATURE_MILKSHAKE_FORCE_DISABLED:
+            case FEATURE_MILKSHAKE_ACTIVATION_DISABLED:
+                return !milkshake();
+            case FEATURE_MUSIC_NEW_CATALOG:
+                return musicnewcatalog();
             default:
                 return true;
         }

smali/res/xml/preferences_interface.xml

@@ -16,19 +16,19 @@
             android:key="swipe"
             android:title="@string/interfacenewsfeedswipe" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="Молочный кок или почему я не осилил инжектнуть тогглы">
+    <PreferenceCategory android:title="Toggles test">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="milkshake"
             android:title="milkshake" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="returnnorifs"
-            android:title="returnnorifs" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="superapp"
             android:title="superapp" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="true"
+            android:key="musicnewcatalog"
+            android:title="musicnewcatalog" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceglobal">
         <com.vtosters.lite.ui.SummaryListPreference

smali/smali_classes3/com/vk/music/model/IpcPlayerModelImpl.smali

@@ -1927,7 +1927,7 @@
     .end annotation
 
     .line 10
-    invoke-static {p1, p2, p3}, Lbruhcollective/itaysonlab/libvkx/client/LibVKXClient;->play(Lcom/vk/dto/music/MusicTrack;Ljava/util/List;Lcom/vk/music/PlayerRefer;)Z
+    invoke-static {p1, p2, p3}, Lbruhcollective/itaysonlab/libvkx/client/LibVKXClient;->play(Lcom/vk/dto/music/MusicTrack;Ljava/util/List;Lcom/vk/music/common/MusicPlaybackLaunchContext;)Z
 
     move-result v0
 
@@ -1936,7 +1936,6 @@
     return-void
 
     :cond_b
-    .line 11
     invoke-static {p0}, Lcom/vk/music/model/IpcPlayerModelImpl;->a(Lcom/vk/music/model/IpcPlayerModelImpl;)Lcom/vk/audioipc/core/AudioPlayer;
 
     move-result-object v0

smali/smali_classes4/com/vk/profile/adapter/counters/CountersAdapter$c.smali

@@ -209,29 +209,6 @@
 
     if-lez v0, :cond_1
 
-    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z
-
-    move-result v7
-
-    if-nez v7, :cond_228
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    int-to-long v5, v0
-
-    invoke-virtual {v1, v5, v6}, Ljava/text/NumberFormat;->format(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, ""
-
-    goto :goto_0
-
-    :cond_228
     .line 4
     new-instance v4, Ljava/lang/StringBuilder;