From 58c1f64dfe98e55bf01186bc89c9d241c051d26c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 3 Apr 2024 10:44:04 -0400
Subject: [PATCH] Allow familyName-only nicknames in storage service.

---
 .../securesms/storage/ContactRecordProcessor.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
index 2906b35f3f..f26948c98a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
@@ -153,16 +153,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
       profileFamilyName = local.getProfileFamilyName().orElse("");
     }
 
-    String nicknameGivenName  = remote.getNicknameGivenName().orElse("");
-    String nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
-
-    if (StringUtil.isVisuallyEmpty(nicknameGivenName) && !StringUtil.isVisuallyEmpty(nicknameFamilyName)) {
-      Log.w(TAG, "Processed invalid nickname. Missing given name.");
-
-      nicknameGivenName  = "";
-      nicknameFamilyName = "";
-    }
-
     IdentityState identityState;
     byte[]        identityKey;
 
@@ -227,6 +217,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
     String               systemGivenName       = SignalStore.account().isPrimaryDevice() ? local.getSystemGivenName().orElse("") : remote.getSystemGivenName().orElse("");
     String               systemFamilyName      = SignalStore.account().isPrimaryDevice() ? local.getSystemFamilyName().orElse("") : remote.getSystemFamilyName().orElse("");
     String               systemNickname        = remote.getSystemNickname().orElse("");
+    String               nicknameGivenName     = remote.getNicknameGivenName().orElse("");
+    String               nicknameFamilyName    = remote.getNicknameFamilyName().orElse("");
     boolean              pniSignatureVerified  = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
     String               note                  = remote.getNote().or(local::getNote).orElse("");
     boolean              matchesRemote         = doParamsMatch(remote, unknownFields, aci, pni, e164, profileGivenName, profileFamilyName, systemGivenName, systemFamilyName, systemNickname, profileKey, username, identityState, identityKey, blocked, profileSharing, archived, forcedUnread, muteUntil, hideStory, unregisteredTimestamp, hidden, pniSignatureVerified, nicknameGivenName, nicknameFamilyName, note);