From 0efdefb207656e7a5ecb64b39641910e496e71f5 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 15 Sep 2022 23:57:15 +0300
Subject: [PATCH] ThemeChanging meme

---
 .../ru/vtosters/lite/hooks/JsonInjectors.java |  2 +-
 .../lite/ui/dialogs/ThemeChanging.java        | 33 +++++++++++++++++++
 .../navigation/right/RightMenuPresenter.smali |  4 +--
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
index cd1eecf7d..b51e2d501 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
@@ -447,7 +447,7 @@ public class JsonInjectors {
     }
 
     public static JSONObject fetchCatalogId(String section) {
-        if (section == null) return null;
+        if (section.isEmpty()) return null;
 
         var request = new Request.a()
                 .b("https://" + getApi() + "/method/catalog.getAudio"
diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java
new file mode 100644
index 000000000..6889428e5
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java
@@ -0,0 +1,33 @@
+package ru.vtosters.lite.ui.dialogs;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+import android.app.Activity;
+
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.core.ui.themes.VKThemeHelper;
+
+import ru.vtosters.lite.hooks.VKUIHook;
+
+public class ThemeChanging{
+    public static void changeTheme(Activity activity, float[] f){
+        if (getBoolValue("systemtheme", true)) {
+            new VkAlertDialog.Builder(activity)
+                    .setTitle("Внимание!")
+                    .setMessage("У вас включена системная тема \n" +
+                            "При переключении темы системная тема будет отключена \n\n" +
+                            "Вы действительно хотите отключить её?")
+                    .setCancelable(false)
+                    .setPositiveButton("Отключить", (dialogInterface, i) -> {
+                        edit().putBoolean("systemtheme", false).commit();
+                        VKThemeHelper.b(activity, f);
+                        VKUIHook.clearWebCache();
+                    })
+                    .setNeutralButton("Отмена", null)
+                    .show();
+        } else {
+            VKThemeHelper.b(activity, f);
+            VKUIHook.clearWebCache();
+        }
+    }
+}
diff --git a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali
index f94f9c665..1e5fbb1d4 100644
--- a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali
+++ b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali
@@ -242,9 +242,7 @@
     if-eqz v0, :cond_0
 
     .line 6
-    invoke-static {v0, p1}, Lcom/vk/core/ui/themes/VKThemeHelper;->b(Landroid/app/Activity;[F)V
-
-    invoke-static {}, Lru/vtosters/lite/hooks/VKUIHook;->clearWebCache()V
+    invoke-static {v0, p1}, Lru/vtosters/lite/ui/dialogs/ThemeChanging;->changeTheme(Landroid/app/Activity;[F)V
 
     :cond_0
     return-void