From 92b7147dcd42829b873ef86192c2fae9ae0da16c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 2 Apr 2024 20:02:35 -0400
Subject: [PATCH] Always take the remote nickname.

---
 .../securesms/storage/ContactRecordProcessor.java     | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 c306b80256..2906b35f3f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
@@ -153,15 +153,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
       profileFamilyName = local.getProfileFamilyName().orElse("");
     }
 
-    String nicknameGivenName;
-    String nicknameFamilyName;
-    if (remote.getNicknameGivenName().isPresent()) {
-      nicknameGivenName = remote.getNicknameGivenName().orElse("");
-      nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
-    } else {
-      nicknameGivenName = local.getNicknameGivenName().orElse("");
-      nicknameFamilyName = local.getNicknameFamilyName().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.");