VCard - FN should containt displayName/nickname

Author: hamorillo

homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/model/VCard.kt

@@ -19,16 +19,14 @@ internal class VCard private constructor(
 
         val firstName = firstName.orEmpty()
         val lastName = lastName.orEmpty()
-        val nickname = nickname.orEmpty()
         if (firstName.isNotEmpty() || lastName.isNotEmpty()) {
             contentBuilder.append("N:${lastName.escaped()};${firstName.escaped()};;;\n")
-                .append(
-                    "FN:${("${firstName.escaped()} ${lastName.escaped()}".trim()).ifEmpty { nickname.escaped() }}\n"
-                )
         }
-        val calculatedNickname = nickname.ifEmpty { "$firstName $lastName".trim() }.escaped()
-
-        calculatedNickname.takeIf { it.isNotEmpty() }?.let { contentBuilder.append("NICKNAME:${it.escaped()}\n") }
+        nickname?.takeIf { it.isNotEmpty() }?.let {
+            contentBuilder
+                .append("NICKNAME:${it.escaped()}\n")
+                .append("FN:${it.escaped()}\n")
+        }
         organization?.takeIf { it.isNotEmpty() }?.let { contentBuilder.append("ORG:${it.escaped()}\n") }
         title?.takeIf { it.isNotEmpty() }?.let { contentBuilder.append("TITLE:${it.escaped()}\n") }
         profileUrl?.takeIf { it.isNotEmpty() }?.let { contentBuilder.append("URL:${it.escaped()}\n") }

homeUi/src/test/kotlin/com/gravatar/app/homeUi/presentation/home/share/model/VCardTest.kt

@@ -26,7 +26,7 @@ class VCardTest {
         assertTrue(vCardString.contains("VERSION:3.0"))
         assertTrue(vCardString.contains("PRODID:Gravatar Android"))
         assertTrue(vCardString.contains("N:Doe;John;;;"))
-        assertTrue(vCardString.contains("FN:John Doe"))
+        assertTrue(vCardString.contains("FN:Johnny"))
         assertTrue(vCardString.contains("NICKNAME:Johnny"))
         assertTrue(vCardString.contains("ORG:Gravatar"))
         assertTrue(vCardString.contains("TITLE:Developer"))
@@ -51,8 +51,6 @@ class VCardTest {
         assertTrue(vCardString.contains("VERSION:3.0"))
         assertTrue(vCardString.contains("PRODID:Gravatar Android"))
         assertTrue(vCardString.contains("N:;Jane;;;")) // Last name is empty
-        assertTrue(vCardString.contains("FN:Jane")) // FN falls back to first name
-        assertTrue(vCardString.contains("NICKNAME:Jane")) // Nickname falls back to FN
         assertTrue(vCardString.contains("ORG:Automattic"))
         assertTrue(vCardString.contains("EMAIL:jane.doe@example.com"))
         assertTrue(vCardString.endsWith("END:VCARD"))
@@ -78,49 +76,6 @@ class VCardTest {
         )
     }
 
-    @Test
-    fun `FN and NICKNAME fall back correctly when names or nickname are empty`() {
-        // Case 1: Only first name
-        var vCard = VCard.Builder().firstName("Solo").build()
-        var vCardString = vCard.toString()
-        assertTrue(vCardString.contains("N:;Solo;;;"))
-        assertTrue(vCardString.contains("FN:Solo"))
-        assertTrue(vCardString.contains("NICKNAME:Solo"))
-
-        // Case 2: Only last name
-        vCard = VCard.Builder().lastName("OnlyLastName").build()
-        vCardString = vCard.toString()
-        assertTrue(vCardString.contains("N:OnlyLastName;;;;"))
-        assertTrue(vCardString.contains("FN:OnlyLastName"))
-        assertTrue(vCardString.contains("NICKNAME:OnlyLastName"))
-
-        // Case 3: First name, last name, but empty nickname
-        vCard = VCard.Builder().firstName("First").lastName("Last").nickname("").build()
-        vCardString = vCard.toString()
-        assertTrue(vCardString.contains("N:Last;First;;;"))
-        assertTrue(vCardString.contains("FN:First Last"))
-        assertTrue(vCardString.contains("NICKNAME:First Last")) // Falls back to FN
-
-        // Case 4: Only nickname
-        vCard = VCard.Builder().nickname("JustNickname").build()
-        vCardString = vCard.toString()
-        assertEquals(
-            "BEGIN:VCARD\n" +
-                "VERSION:3.0\n" +
-                "PRODID:Gravatar Android\n" +
-                "NICKNAME:JustNickname\n" +
-                "END:VCARD",
-            vCardString
-        )
-
-        // Case 5: First name, last name, and nickname (nickname should take precedence for NICKNAME field)
-        vCard = VCard.Builder().firstName("Official").lastName("Name").nickname("PreferredNick").build()
-        vCardString = vCard.toString()
-        assertTrue(vCardString.contains("N:Name;Official;;;"))
-        assertTrue(vCardString.contains("FN:Official Name"))
-        assertTrue(vCardString.contains("NICKNAME:PreferredNick"))
-    }
-
     @Test
     fun `builder handles null inputs gracefully`() {
         val vCard = VCard.Builder()
@@ -186,7 +141,7 @@ class VCardTest {
         val vCardString = vCard.toString()
 
         assertTrue(vCardString.contains("N:Last Name;First Name;;;"))
-        assertTrue(vCardString.contains("FN:First Name Last Name"))
+        assertTrue(vCardString.contains("FN:Nick Name"))
         assertTrue(vCardString.contains("NICKNAME:Nick Name"))
         assertTrue(vCardString.contains("ORG:Org Name"))
         assertTrue(vCardString.contains("TITLE:Job Title"))