Skip to content

Commit c7bf498

Browse files
committed
Don't show toast because of changing content language or country
1 parent 35abb99 commit c7bf498

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
public class ContentSettingsFragment extends BasePreferenceFragment {
2828
private String youtubeRestrictedModeEnabledKey;
2929

30-
private Localization initialSelectedLocalization;
31-
private ContentCountry initialSelectedContentCountry;
3230
private String initialLanguage;
3331

3432
@Override
@@ -37,10 +35,6 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
3735

3836
addPreferencesFromResourceRegistry();
3937

40-
initialSelectedLocalization = org.schabi.newpipe.util.Localization
41-
.getPreferredLocalization(requireContext());
42-
initialSelectedContentCountry = org.schabi.newpipe.util.Localization
43-
.getPreferredContentCountry(requireContext());
4438
initialLanguage = defaultPreferences.getString(getString(R.string.app_language_key), "en");
4539

4640
if (Build.VERSION.SDK_INT >= 33) {
@@ -98,23 +92,21 @@ public boolean onPreferenceTreeClick(final Preference preference) {
9892
public void onDestroy() {
9993
super.onDestroy();
10094

101-
final Localization selectedLocalization = org.schabi.newpipe.util.Localization
102-
.getPreferredLocalization(requireContext());
103-
final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
104-
.getPreferredContentCountry(requireContext());
10595
final String selectedLanguage =
10696
defaultPreferences.getString(getString(R.string.app_language_key), "en");
10797

108-
if (!selectedLocalization.equals(initialSelectedLocalization)
109-
|| !selectedContentCountry.equals(initialSelectedContentCountry)
110-
|| !selectedLanguage.equals(initialLanguage)) {
98+
if (!selectedLanguage.equals(initialLanguage)) {
11199
if (Build.VERSION.SDK_INT < 33) {
112100
Toast.makeText(
113101
requireContext(),
114102
R.string.localization_changes_requires_app_restart,
115103
Toast.LENGTH_LONG
116104
).show();
117105
}
106+
final Localization selectedLocalization = org.schabi.newpipe.util.Localization
107+
.getPreferredLocalization(requireContext());
108+
final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
109+
.getPreferredContentCountry(requireContext());
118110
NewPipe.setupLocalization(selectedLocalization, selectedContentCountry);
119111
}
120112
}

0 commit comments

Comments
 (0)