tor-browser

commit 368dc6bb33d835359508081759c60916c410cc50
parent f7a39edacec0c0da47b30e17afb635751d8d7faa
Author: Jeff Boek <j@jboek.com>
Date:   Wed, 29 Oct 2025 00:07:27 +0000

Bug 1996965 - Updates regions address feature is available in r=android-reviewers,matt-tighe

Differential Revision: https://phabricator.services.mozilla.com/D270432

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/autofill/address/AddressFeatureGate.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/addresses/AddressesDebugRegionRepository.kt
 | 
4
----
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/autofill/address/RegionAddressFeatureGateTest.kt
 | 
23
+++++++++++++----------

3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/autofill/address/AddressFeatureGate.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/autofill/address/AddressFeatureGate.kt
@@ -34,7 +34,7 @@ class RegionAddressFeatureGate(
     }
 
     companion object {
-        private val SUPPORTED_REGIONS = setOf("US", "CA")
+        private val SUPPORTED_REGIONS = setOf("US", "CA", "GB", "FR", "DE", "BR", "ES", "JP")
     }
 }
 
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/addresses/AddressesDebugRegionRepository.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/addresses/AddressesDebugRegionRepository.kt
@@ -15,11 +15,7 @@ private const val SHARED_PREFS_FILENAME = "ADDRESSES_DEBUG_REGION"
  * List of regions that can be enabled for debugging purposes only.
  */
 enum class DebugRegion(val country: String) {
-    DE("DE"),
-    FR("FR"),
     AU("AU"),
-    GB("GB"),
-    JP("JP"),
 }
 
 /**
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/autofill/address/RegionAddressFeatureGateTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/autofill/address/RegionAddressFeatureGateTest.kt
@@ -15,7 +15,16 @@ import java.util.Locale
 class RegionAddressFeatureGateTest {
     @Test
     fun `GIVEN an enabled region WHEN calling isAddressFeatureEnabled THEN return true`() {
-        listOf(Locale.US, Locale.CANADA).forEach {
+        listOf(
+            Locale.US,
+            Locale.CANADA,
+            Locale.GERMANY,
+            Locale.JAPAN,
+            Locale.UK,
+            Locale.FRANCE,
+            Locale.forLanguageTag("pt-BR"),
+            Locale.forLanguageTag("es-ES"),
+        ).forEach {
             val featureGate = RegionAddressFeatureGate(it, EmptyAddressesDebugRegionRepository())
             assertTrue(featureGate.isAddressFeatureEnabled())
         }
@@ -24,13 +33,7 @@ class RegionAddressFeatureGateTest {
     @Test
     fun `GIVEN an unavailable region WHEN calling isAddressFeatureEnabled THEN return false`() {
         listOf(
-            Locale.GERMANY,
-            Locale.JAPAN,
-            Locale.UK,
-            Locale.FRANCE,
-            Locale.forLanguageTag("pt-BR"),
-            Locale.forLanguageTag("es-ES"),
-            Locale.forLanguageTag("ja-JP"),
+            Locale.forLanguageTag("en-AU"),
         ).forEach {
             val featureGate = RegionAddressFeatureGate(it, EmptyAddressesDebugRegionRepository())
             assertFalse(featureGate.isAddressFeatureEnabled())
@@ -40,10 +43,10 @@ class RegionAddressFeatureGateTest {
     @Test
     fun `GIVEN a region enabled in the AddressDebugRegionRepository WHEN calling isAddressFeatureEnabled THEN return true`() {
         val repository = FakeAddressesDebugRegionRepository().also {
-            it.setRegionEnabled(DebugRegion.JP, true)
+            it.setRegionEnabled(DebugRegion.AU, true)
         }
 
-        val featureGate = RegionAddressFeatureGate(Locale.JAPAN, repository)
+        val featureGate = RegionAddressFeatureGate(Locale.forLanguageTag("en-AU"), repository)
         assertTrue(featureGate.isAddressFeatureEnabled())
     }
 }