From 34321d520ea497f625ed3940fa9a88e52f8bf736 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 6 Apr 2023 01:28:12 +0400 Subject: [PATCH] fix(youtube/settings): fix dialog not shown if dismissed with back button --- .../settingsmenu/ReVancedSettingsFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/integrations/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java b/integrations/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java index 43a240dd4..f8ce46a05 100644 --- a/integrations/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java +++ b/integrations/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java @@ -32,7 +32,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment { /** * If a dialog is currently being shown. Used to prevent showing additional dialogs if user cancels a dialog. */ - private static boolean currentlyShowingDialog; + private boolean currentlyShowingDialog; SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> { try { @@ -136,6 +136,9 @@ public class ReVancedSettingsFragment extends PreferenceFragment { }) .setNegativeButton(negativeButton, (dialog, id) -> { currentlyShowingDialog = false; + }) + .setOnDismissListener((dialog) -> { + currentlyShowingDialog = false; }).show(); } @@ -156,7 +159,9 @@ public class ReVancedSettingsFragment extends PreferenceFragment { SettingsEnum.setValue(setting, defaultBooleanValue); switchPref.setChecked(defaultBooleanValue); currentlyShowingDialog = false; + }) + .setOnDismissListener((dialog) -> { + currentlyShowingDialog = false; }).show(); } - }