From bff07946c29dcdf6325cb0c0c15e43dca64369de Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Wed, 24 Sep 2025 17:33:39 +0200
Subject: [PATCH] fix:3514: Avoid switching output country when Tor is running.

---
 .../features/internetprivacy/InternetPrivacyFragment.kt    | 7 +++++++
 app/src/main/res/values-de/strings.xml                     | 1 +
 app/src/main/res/values-es/strings.xml                     | 1 +
 app/src/main/res/values-fi/strings.xml                     | 2 +-
 app/src/main/res/values-fr/strings.xml                     | 3 ++-
 app/src/main/res/values-it/strings.xml                     | 1 +
 app/src/main/res/values-nl/strings.xml                     | 2 +-
 app/src/main/res/values/strings.xml                        | 3 ++-
 8 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
index f23bfb28..d7025d6a 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
@@ -77,6 +77,12 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
             tooltipTextId = R.string.ipscrambling_app_list_infos
         )
 
+        setToolTipForAsterisk(
+            textView = binding.ipscramblingLocationLabel,
+            textId = R.string.ipscrambling_location_label,
+            tooltipTextId = R.string.ipscrambling_select_location_tooltip
+        )
+
         binding.ipscramblingSelectLocation.apply {
             adapter = ArrayAdapter(
                 requireContext(), android.R.layout.simple_spinner_item,
@@ -140,6 +146,7 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
         }
 
         binding.ipscramblingSelectLocation.setSelection(state.selectedLocationPosition)
+        binding.ipscramblingSelectLocation.isEnabled = state.mode == FeatureState.OFF
 
         // TODO: this should not be mandatory.
         binding.apps.post {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 64f4b09b..9c412985 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -39,6 +39,7 @@
     <string name="location_hint_latitude">Breitengrad</string>
     <string name="location_input_error">Ungültige Koordinaten</string>
     <string name="trackers_title">App-Tracker verwalten</string>
+    <string name="ipscrambling_select_location_tooltip">Deaktivieren Sie „Meine IP-Adresse verstecken“, um diese Einstellung zu ändern</string>
     <string name="location_title">Meinen Standort verwalten</string>
     <string name="location_info">Dein Standort kann sehr viel über dich und deine Aktivitäten verraten.
 \n
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0d690aec..a24b56d0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -15,6 +15,7 @@
     <string name="ipscrambling_location_label">Mi actividad en internet debe aparecer desde:</string>
     <string name="ipscrambling_any_location">País al azar</string>
     <string name="ipscrambling_select_app">Aplicar esta configuración a todas las aplicaciones seleccionadas * :</string>
+    <string name="ipscrambling_select_location_tooltip">Desactiva \"Ocultar mi IP real\" para cambiar esta configuración</string>
     <string name="location_title">Administrar mi ubicación</string>
     <string name="location_use_real_location">Usar mi ubicación real</string>
     <string name="location_use_random_location">Usar una ubicación aceptable al azar</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3962becd..c1942466 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -28,7 +28,7 @@
     <string name="ipscrambling_warning_starting_long">Piilotetun IP-palvelumme käynnistäminen vie aikaa. Se voi kestää muutaman minuutin. Ruudulta poistuminen ei keskeytä prosessia.</string>
     <string name="ipscrambling_select_app">Sovella tätä asetusta kaikkiin valittuihin sovelluksiin * :</string>
     <string name="ipscrambling_any_location">Satunnaisesta maasta</string>
-    <string name="ipscrambling_location_label">Internet-toimintani täytyy näyttää olevan peräisin:</string>
+    <string name="ipscrambling_location_label">Internet-toimintani täytyy näyttää olevan peräisin * :</string>
     <string name="ipscrambling_tor_disclaimer"><b>Huomaa:</b> Kun tämä vaihtoehto on käytössä, Internetyhteytesi nopeus todennäköisesti alenee merkittävästi.</string>
     <string name="dashboard_location_title">Sijainti</string>
     <string name="dashboard_apps_permissions_title">Hallitse sovellusten lupia</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5c2a71d9..8066012f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -27,7 +27,7 @@
     <string name="ipscrambling_hide_ip_label">Masquer ma vraie adresse IP</string>
     <string name="ipscrambling_hide_ip_subtitle">Je navigue anonymement sur Internet</string>
     <string name="ipscrambling_tor_disclaimer"><b>Note :</b> Tant que cette option est active, votre vitesse de connexion est susceptible d\'être considérablement réduite.</string>
-    <string name="ipscrambling_location_label">Mon activité Internet doit apparaître depuis :</string>
+    <string name="ipscrambling_location_label">Mon activité Internet doit apparaître depuis * :</string>
     <string name="ipscrambling_any_location">Pays aléatoire</string>
     <string name="ipscrambling_select_app">Appliquer ce paramètre à toutes les applications sélectionnées * :</string>
     <string name="dashboard_graph_trackers_legend">%s pisteurs vous ont profilé durant les dernières 24 heures</string>
@@ -44,6 +44,7 @@
     <string name="apptrackers_block_all_toggle">Activer le contrôle des pisteurs</string>
     <string name="apptrackers_no_trackers_yet_block_off">Aucun pisteur n\'a été détecté pour l\'instant. Si de nouveaux pisteurs sont détectés, ils seront listés ici.</string>
     <string name="apptrackers_no_trackers_yet_block_on">Aucun pisteur n\'a été détecté pour l\'instant. Tous les futurs pisteurs seront bloqués.</string>
+    <string name="ipscrambling_select_location_tooltip">Désactivez « Masquer mon adresse IP » pour modifier ce paramètre</string>
     <string name="location_title">Gérer ma position</string>
     <string name="location_use_real_location">Utiliser ma vraie position</string>
     <string name="location_use_random_location">Utiliser une position aléatoire plausible</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 996074fe..c42d1e4e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,6 +17,7 @@
     <string name="ipscrambling_location_label">La mia attività Internet deve apparire come provenisse da:</string>
     <string name="ipscrambling_any_location">Una nazione a caso</string>
     <string name="ipscrambling_select_app">Applica questa impostazione a tutte le app selezionate * :</string>
+    <string name="ipscrambling_select_location_tooltip">Disattiva \"Nascondi IP\" per modificare questa impostazione</string>
     <string name="location_title">Gestisci la posizione</string>
     <string name="location_use_real_location">Usa la posizione reale</string>
     <string name="location_use_random_location">Usa una posizione a caso plausibile</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c691a8cb..3c1f2b86 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -65,7 +65,7 @@
     <string name="ipscrambling_select_app" weblate_ctx="ip">Pas deze instelling toe op alle geselecteerde applicaties * :</string>
     <string name="ipscrambling_app_list_infos">Enkel apps met internettoegang zijn weergegeven.</string>
     <string name="ipscrambling_error_always_on_vpn_already_running">Deactiveer jouw VPN %s, zodat Advanced Privacy je echte IP-adres kan verbergen.</string>
-    <string name="ipscrambling_location_label" weblate_ctx="ip">Mijn internetactiviteit moet zogenaamd komen uit:</string>
+    <string name="ipscrambling_location_label" weblate_ctx="ip">Mijn internetactiviteit moet zogenaamd komen uit * :</string>
     <string name="ipscrambling_warning_starting_long">Het opstarten van onze vals IP-adresdienst kost tijd en kan enkele minuten duren. Dit scherm verlaten zal het proces niet onderbreken.</string>
     <string name="location_title" weblate_ctx="location-1">Mijn locatie beheren</string>
     <string name="location_info" weblate_ctx="location-1">Je locatie kan veel over jou en jouw activiteiten lekken.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d0c3a40..39dcd3b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,12 +88,13 @@
     <string name="ipscrambling_hide_ip_label" weblate_ctx="ip">Hide my real IP address</string>
     <string name="ipscrambling_hide_ip_subtitle" weblate_ctx="ip">I am anonymous on the Internet</string>
     <string name="ipscrambling_tor_disclaimer" weblate_ctx="ip"><b>Note:</b> While this option is active, your Internet speed is likely to be significantly reduced.</string>
-    <string name="ipscrambling_location_label" weblate_ctx="ip">My Internet activity must appear from:</string>
+    <string name="ipscrambling_location_label" weblate_ctx="ip">My Internet activity must appear from * :</string>
     <string name="ipscrambling_any_location" weblate_ctx="ip">Random country</string>
     <string name="ipscrambling_select_app" weblate_ctx="ip">Apply this setting to all selected applications * :</string>
     <string name="ipscrambling_app_list_infos">Only apps with Internet permission are listed.</string>
     <string name="ipscrambling_error_always_on_vpn_already_running">Please disable the 3rd-party VPN %s in order for Advanced Privacy to hide your real IP address.</string>
     <string name="ipscrambling_warning_starting_long">Our scrambling IP service is taking time to launch. It can take a few minutes. Leaving the screen won\'t interrupt the process.</string>
+    <string name="ipscrambling_select_location_tooltip">Switch off \"hide my real IP address\" to change this setting</string>
 
     <!-- Location -->
     <string name="location_title" weblate_ctx="location-1">Manage my location</string>
-- 
GitLab