ReVanced/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2025-05-02 15:44:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(youtube/settings): remove code that is no longer needed

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2023-04-06 01:40:53 +04:00 committed by oSumAtrIX
parent 584de16236
commit 80ae9ebbd2
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
View File

@ -29,11 +29,6 @@ import app.revanced.integrations.utils.LogHelper;
import app.revanced.integrations.utils.ReVancedUtils; import app.revanced.integrations.utils.ReVancedUtils;
public class ReVancedSettingsFragment extends PreferenceFragment { 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) -> { SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
try { try {
SettingsEnum setting = SettingsEnum.settingFromPath(str); SettingsEnum setting = SettingsEnum.settingFromPath(str);
@ -70,13 +65,11 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
LogHelper.printException(() -> "Setting cannot be handled: " + pref.getClass() + " " + pref); LogHelper.printException(() -> "Setting cannot be handled: " + pref.getClass() + " " + pref);
} }
if (!currentlyShowingDialog) {
if (setting.userDialogMessage != null && ((SwitchPreference) pref).isChecked() != (Boolean) setting.defaultValue) { if (setting.userDialogMessage != null && ((SwitchPreference) pref).isChecked() != (Boolean) setting.defaultValue) {
showSettingUserDialogConfirmation(getActivity(), (SwitchPreference) pref, setting); showSettingUserDialogConfirmation(getActivity(), (SwitchPreference) pref, setting);
} else if (setting.rebootApp) { } else if (setting.rebootApp) {
rebootDialog(getActivity()); rebootDialog(getActivity());
} }
}
enableDisablePreferences(); enableDisablePreferences();
} catch (Exception ex) { } catch (Exception ex) {
@ -126,42 +119,30 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
} }
private void rebootDialog(@NonNull Activity activity) { private void rebootDialog(@NonNull Activity activity) {
currentlyShowingDialog = true;
String positiveButton = str("in_app_update_restart_button"); String positiveButton = str("in_app_update_restart_button");
String negativeButton = str("sign_in_cancel"); String negativeButton = str("sign_in_cancel");
new AlertDialog.Builder(activity).setMessage(str("pref_refresh_config")) new AlertDialog.Builder(activity).setMessage(str("pref_refresh_config"))
.setPositiveButton(positiveButton, (dialog, id) -> { .setPositiveButton(positiveButton, (dialog, id) -> {
reboot(activity); reboot(activity);
currentlyShowingDialog = false;
}) })
.setNegativeButton(negativeButton, (dialog, id) -> { .setNegativeButton(negativeButton, null)
currentlyShowingDialog = false; .show();
})
.setOnDismissListener((dialog) -> {
currentlyShowingDialog = false;
}).show();
} }
private void showSettingUserDialogConfirmation(@NonNull Activity activity, SwitchPreference switchPref, SettingsEnum setting) { private void showSettingUserDialogConfirmation(@NonNull Activity activity, SwitchPreference switchPref, SettingsEnum setting) {
currentlyShowingDialog = true;
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle(str("revanced_settings_confirm_user_dialog_title")) .setTitle(str("revanced_settings_confirm_user_dialog_title"))
.setMessage(setting.userDialogMessage.toString()) .setMessage(setting.userDialogMessage.toString())
.setPositiveButton(android.R.string.ok, (dialog, id) -> { .setPositiveButton(android.R.string.ok, (dialog, id) -> {
if (setting.rebootApp) { if (setting.rebootApp) {
rebootDialog(activity); rebootDialog(activity);
} else {
currentlyShowingDialog = false;
} }
}) })
.setNegativeButton(android.R.string.cancel, (dialog, id) -> { .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
Boolean defaultBooleanValue = (Boolean) setting.defaultValue; Boolean defaultBooleanValue = (Boolean) setting.defaultValue;
SettingsEnum.setValue(setting, defaultBooleanValue); SettingsEnum.setValue(setting, defaultBooleanValue);
switchPref.setChecked(defaultBooleanValue); switchPref.setChecked(defaultBooleanValue);
currentlyShowingDialog = false;
}) })
.setOnDismissListener((dialog) -> { .show();
currentlyShowingDialog = false;
}).show();
} }
} }