diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java index 1b778d338..67eeb0b71 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java @@ -53,7 +53,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment { * Set by subclasses if Strings cannot be added as a resource. */ @Nullable - protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle, restartDialogMessage; + protected static String restartDialogTitle, restartDialogMessage, restartDialogButtonText, confirmDialogTitle; private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> { try { @@ -152,6 +152,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment { ); dialogPair.first.setOnDismissListener(d -> showingUserDialogMessage = false); + dialogPair.first.setCancelable(false); // Show the dialog. dialogPair.first.show(); diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java index cf7223333..82120de78 100644 --- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java +++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java @@ -2,12 +2,15 @@ package app.revanced.extension.tiktok.settings.preference; import android.preference.Preference; import android.preference.PreferenceScreen; + import androidx.annotation.NonNull; + +import app.revanced.extension.shared.Utils; import app.revanced.extension.shared.settings.Setting; import app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment; import app.revanced.extension.tiktok.settings.preference.categories.DownloadsPreferenceCategory; -import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory; import app.revanced.extension.tiktok.settings.preference.categories.ExtensionPreferenceCategory; +import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory; import app.revanced.extension.tiktok.settings.preference.categories.SimSpoofPreferenceCategory; /** @@ -37,10 +40,14 @@ public class TikTokPreferenceFragment extends AbstractPreferenceFragment { // Currently no resources can be compiled for TikTok (fails with aapt error). // So all TikTok Strings are hard coded in the extension. - restartDialogTitle = "Refresh and restart"; + restartDialogTitle = "Restart required"; + restartDialogMessage = "Restart the app for this change to take effect."; restartDialogButtonText = "Restart"; confirmDialogTitle = "Do you wish to proceed?"; + // App does not use dark mode. + Utils.setIsDarkModeEnabled(false); + PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(context); setPreferenceScreen(preferenceScreen);