Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Don't show toast because of changing content language or country

Browse source
This commit is contained in:
Miles Krell 2025-03-16 20:27:05 -04:00
parent b2daa9a02c
commit d71305dbb7
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
View file

@ -27,8 +27,6 @@ import java.util.Locale;
public class ContentSettingsFragment extends BasePreferenceFragment { public class ContentSettingsFragment extends BasePreferenceFragment {
private String youtubeRestrictedModeEnabledKey; private String youtubeRestrictedModeEnabledKey;
private Localization initialSelectedLocalization;
private ContentCountry initialSelectedContentCountry;
private String initialLanguage; private String initialLanguage;
@Override @Override
@ -37,10 +35,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
addPreferencesFromResourceRegistry(); addPreferencesFromResourceRegistry();
initialSelectedLocalization = org.schabi.newpipe.util.Localization
.getPreferredLocalization(requireContext());
initialSelectedContentCountry = org.schabi.newpipe.util.Localization
.getPreferredContentCountry(requireContext());
initialLanguage = defaultPreferences.getString(getString(R.string.app_language_key), "en"); initialLanguage = defaultPreferences.getString(getString(R.string.app_language_key), "en");
if (Build.VERSION.SDK_INT >= 33) { if (Build.VERSION.SDK_INT >= 33) {
@ -98,16 +92,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
final Localization selectedLocalization = org.schabi.newpipe.util.Localization
.getPreferredLocalization(requireContext());
final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
.getPreferredContentCountry(requireContext());
final String selectedLanguage = final String selectedLanguage =
defaultPreferences.getString(getString(R.string.app_language_key), "en"); defaultPreferences.getString(getString(R.string.app_language_key), "en");
if (!selectedLocalization.equals(initialSelectedLocalization) if (!selectedLanguage.equals(initialLanguage)) {
|| !selectedContentCountry.equals(initialSelectedContentCountry)
|| !selectedLanguage.equals(initialLanguage)) {
if (Build.VERSION.SDK_INT < 33) { if (Build.VERSION.SDK_INT < 33) {
Toast.makeText( Toast.makeText(
requireContext(), requireContext(),
@ -115,6 +103,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
Toast.LENGTH_LONG Toast.LENGTH_LONG
).show(); ).show();
} }
final Localization selectedLocalization = org.schabi.newpipe.util.Localization
.getPreferredLocalization(requireContext());
final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
.getPreferredContentCountry(requireContext());
NewPipe.setupLocalization(selectedLocalization, selectedContentCountry); NewPipe.setupLocalization(selectedLocalization, selectedContentCountry);
} }
} }