From 80ae9ebbd241fa4931124d8dae0e3124e97b4da3 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Thu, 6 Apr 2023 01:40:53 +0400
Subject: [PATCH] refactor(youtube/settings): remove code that is no longer
 needed

---
 .../ReVancedSettingsFragment.java             | 33 ++++---------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java b/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
index f8ce46a0..8862f88e 100644
--- a/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
+++ b/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
@@ -29,11 +29,6 @@ import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public class ReVancedSettingsFragment extends PreferenceFragment {
-    /**
-     * If a dialog is currently being shown.  Used to prevent showing additional dialogs if user cancels a dialog.
-     */
-    private boolean currentlyShowingDialog;
-
     SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
             SettingsEnum setting = SettingsEnum.settingFromPath(str);
@@ -70,12 +65,10 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
                 LogHelper.printException(() -> "Setting cannot be handled: " + pref.getClass() + " " + pref);
             }
 
-            if (!currentlyShowingDialog) {
-                if (setting.userDialogMessage != null && ((SwitchPreference) pref).isChecked() != (Boolean) setting.defaultValue) {
-                    showSettingUserDialogConfirmation(getActivity(), (SwitchPreference) pref, setting);
-                } else if (setting.rebootApp) {
-                    rebootDialog(getActivity());
-                }
+            if (setting.userDialogMessage != null && ((SwitchPreference) pref).isChecked() != (Boolean) setting.defaultValue) {
+                showSettingUserDialogConfirmation(getActivity(), (SwitchPreference) pref, setting);
+            } else if (setting.rebootApp) {
+                rebootDialog(getActivity());
             }
 
             enableDisablePreferences();
@@ -126,42 +119,30 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
     }
 
     private void rebootDialog(@NonNull Activity activity) {
-        currentlyShowingDialog = true;
         String positiveButton = str("in_app_update_restart_button");
         String negativeButton = str("sign_in_cancel");
         new AlertDialog.Builder(activity).setMessage(str("pref_refresh_config"))
                 .setPositiveButton(positiveButton, (dialog, id) -> {
                     reboot(activity);
-                    currentlyShowingDialog = false;
                 })
-                .setNegativeButton(negativeButton, (dialog, id) -> {
-                    currentlyShowingDialog = false;
-                })
-                .setOnDismissListener((dialog) -> {
-                    currentlyShowingDialog = false;
-                }).show();
+                .setNegativeButton(negativeButton,  null)
+                .show();
     }
 
     private void showSettingUserDialogConfirmation(@NonNull Activity activity, SwitchPreference switchPref, SettingsEnum setting) {
-        currentlyShowingDialog = true;
         new AlertDialog.Builder(activity)
                 .setTitle(str("revanced_settings_confirm_user_dialog_title"))
                 .setMessage(setting.userDialogMessage.toString())
                 .setPositiveButton(android.R.string.ok, (dialog, id) -> {
                     if (setting.rebootApp) {
                         rebootDialog(activity);
-                    } else {
-                        currentlyShowingDialog = false;
                     }
                 })
                 .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
                     Boolean defaultBooleanValue = (Boolean) setting.defaultValue;
                     SettingsEnum.setValue(setting, defaultBooleanValue);
                     switchPref.setChecked(defaultBooleanValue);
-                    currentlyShowingDialog = false;
                 })
-                .setOnDismissListener((dialog) -> {
-                    currentlyShowingDialog = false;
-                }).show();
+                .show();
     }
 }