From c30d017d10c79ce69f1096ca025bb1ba53a8f40b Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 9 Sep 2026 12:26:39 -0400
Subject: [PATCH] Fix missing family name only nickname in export.

---
 .../securesms/backup/v2/exporters/ContactArchiveExporter.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
index 63f61fe827..91da86db53 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
@@ -114,12 +114,12 @@ private fun Cursor.readNickname(): Contact.Name? {
   val given = this.requireString(RecipientTable.NICKNAME_GIVEN_NAME)
   val family = this.requireString(RecipientTable.NICKNAME_FAMILY_NAME)
 
-  if (given.isNullOrEmpty()) {
+  if (given.isNullOrEmpty() && family.isNullOrEmpty()) {
     return null
   }
 
   return Contact.Name(
-    given = given,
+    given = given ?: "",
     family = family ?: ""
   )
 }