tor-browser

commit 3f2ae5ea34f39d9ef4e616869ac37094807c3ae0
parent d98f6b4f0a1f49ebc48b50993cc8b1686831c74f
Author: Segun Famisa <sfamisa@mozilla.com>
Date:   Mon, 27 Oct 2025 23:59:02 +0000

Bug 1979726 - Include "name" in the address label used in autofill "Select Address" list r=android-reviewers,boek

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

Diffstat:
M
mobile/android/android-components/components/concept/storage/src/main/java/mozilla/components/concept/storage/CreditCardsAddressesStorage.kt
 | 
1
+
M
mobile/android/android-components/components/concept/storage/src/test/java/mozilla/components/concept/storage/AddressTest.kt
 | 
4
++--

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mobile/android/android-components/components/concept/storage/src/main/java/mozilla/components/concept/storage/CreditCardsAddressesStorage.kt b/mobile/android/android-components/components/concept/storage/src/main/java/mozilla/components/concept/storage/CreditCardsAddressesStorage.kt
@@ -374,6 +374,7 @@ data class Address(
      */
     val addressLabel: String
         get() = listOf(
+            name,
             streetAddress.toOneLineAddress(),
             addressLevel3,
             addressLevel2,
diff --git a/mobile/android/android-components/components/concept/storage/src/test/java/mozilla/components/concept/storage/AddressTest.kt b/mobile/android/android-components/components/concept/storage/src/test/java/mozilla/components/concept/storage/AddressTest.kt
@@ -14,7 +14,7 @@ class AddressTest {
     fun `WHEN all address properties are present THEN full address present in label`() {
         val address = generateAddress()
         val expected =
-            "${address.streetAddress}, ${address.addressLevel3}, ${address.addressLevel2}, " +
+            "${address.name}, ${address.streetAddress}, ${address.addressLevel3}, ${address.addressLevel2}, " +
                 "${address.organization}, ${address.addressLevel1}, ${address.country}, " +
                 "${address.postalCode}, ${address.tel}, ${address.email}"
 
@@ -29,7 +29,7 @@ class AddressTest {
             email = "",
         )
         val expected =
-            "${address.streetAddress}, ${address.addressLevel2}, ${address.addressLevel1}, " +
+            "${address.name}, ${address.streetAddress}, ${address.addressLevel2}, ${address.addressLevel1}, " +
                 "${address.country}, ${address.postalCode}, ${address.tel}"
 
         assertEquals(expected, address.addressLabel)