From 70059b25d8ad86ab85e56df3d99eb177a6f5bb9f Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sat, 25 Jun 2022 12:05:15 +0300
Subject: [PATCH] fixes of music and debug

---
 smali/res/xml/preferences_debug.xml           | 40 ++++++-------------
 smali/res/xml/preferences_music.xml           | 11 -----
 .../com/vk/auth/api/VKAccount.smali           |  2 +-
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml
index ec046b3d5..e9df03642 100644
--- a/smali/res/xml/preferences_debug.xml
+++ b/smali/res/xml/preferences_debug.xml
@@ -17,26 +17,11 @@
             android:entryValues="@array/animations_values"
             android:key="anim_rtrn_type"
             android:title="@string/franimation" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="msgtails"
-            android:summary="@string/messages_interface_tails_summary"
-            android:title="@string/vtlmsgtails" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="calls"
             android:summary="@string/messages_interface_calls_summary"
             android:title="@string/vtlcalls" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="usevkui"
-            android:summary="@string/debug_experimental_usevkui"
-            android:title="@string/vtlusevkui" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="unlockstats"
-            android:summary="@string/debug_experimental_page_stats_summary"
-            android:title="@string/debug_experimental_page_stats" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="vksans"
@@ -46,10 +31,6 @@
             android:key="libverify"
             android:summary="@string/debug_experimental_libverify_summary"
             android:title="@string/debug_experimental_libverify" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="msgflat"
-            android:title="@string/vtlmsgflat" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="opusmodule"
@@ -61,10 +42,6 @@
             android:entryValues="@array/lang_value"
             android:key="lang_value"
             android:title="@string/debug_experimental_language" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="disableanimstickers"
-            android:title="Disable anim stickers + suggestions" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="useNewSettings"
@@ -74,6 +51,17 @@
             android:key="shakal"
             android:title="shakalish pikchi da" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vk_fix_music_other">
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="true"
+            android:key="gcmfix"
+            android:summary="@string/vk_fix_music_summary"
+            android:title="@string/vk_fix_music" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="true"
+            android:key="musicFixNew"
+            android:title="Фикс музыки v2" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/debug_developer_functions">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
@@ -86,11 +74,7 @@
             android:summary="@string/debug_developer_force_ssl_summary"
             android:title="@string/debug_developer_force_ssl" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="darkmode"
-            android:title="@string/debug_developer_dark_mode" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="isMusicRestricted"
             android:summary="@string/debug_developer_is_music_restricted_summary"
             android:title="@string/debug_developer_is_music_restricted" />
diff --git a/smali/res/xml/preferences_music.xml b/smali/res/xml/preferences_music.xml
index dad8dc9f1..cb79607da 100644
--- a/smali/res/xml/preferences_music.xml
+++ b/smali/res/xml/preferences_music.xml
@@ -17,15 +17,4 @@
             android:key="libvkx_integration"
             android:title="@string/vkx_integration" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vk_fix_music_other">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="gcmfix"
-            android:summary="@string/vk_fix_music_summary"
-            android:title="@string/vk_fix_music" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="musicFixNew"
-            android:title="Фикс музыки v2" />
-    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/smali/smali_classes2/com/vk/auth/api/VKAccount.smali b/smali/smali_classes2/com/vk/auth/api/VKAccount.smali
index 1b28ca609..cb2c337fd 100644
--- a/smali/smali_classes2/com/vk/auth/api/VKAccount.smali
+++ b/smali/smali_classes2/com/vk/auth/api/VKAccount.smali
@@ -2404,7 +2404,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/vk/core/bundle/Container;->a(Lcom/vk/core/bundle/Fields4;Z)Z
 
-    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->hasMusicSubscription()Z
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->isMusicRestricted()Z
 
     move-result v0