From c7bf498c047a7235f9285616d726c999113a82d4 Mon Sep 17 00:00:00 2001
From: Miles Krell <noreply@mileskrell.com>
Date: Sun, 16 Mar 2025 20:27:05 -0400
Subject: [PATCH] Don't show toast because of changing content language or
 country

---
 .../settings/ContentSettingsFragment.java      | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index e3e674610..a8129f680 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -27,8 +27,6 @@ import java.util.Locale;
 public class ContentSettingsFragment extends BasePreferenceFragment {
     private String youtubeRestrictedModeEnabledKey;
 
-    private Localization initialSelectedLocalization;
-    private ContentCountry initialSelectedContentCountry;
     private String initialLanguage;
 
     @Override
@@ -37,10 +35,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         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");
 
         if (Build.VERSION.SDK_INT >= 33) {
@@ -98,16 +92,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     public void 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 =
                 defaultPreferences.getString(getString(R.string.app_language_key), "en");
 
-        if (!selectedLocalization.equals(initialSelectedLocalization)
-                || !selectedContentCountry.equals(initialSelectedContentCountry)
-                || !selectedLanguage.equals(initialLanguage)) {
+        if (!selectedLanguage.equals(initialLanguage)) {
             if (Build.VERSION.SDK_INT < 33) {
                 Toast.makeText(
                         requireContext(),
@@ -115,6 +103,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                         Toast.LENGTH_LONG
                 ).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);
         }
     }