From 7a25ae5b9c435e28988449a911c79045bad8c719 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:24:05 +0100
Subject: [PATCH] Fix reading nickname from storage record

Fixes #1664
---
 .../manager/syncStorage/ContactRecordProcessor.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 12740fbd..2863874b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -267,8 +267,12 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                     .withGivenName(nullIfEmpty(contactProto.systemGivenName))
                     .withFamilyName(nullIfEmpty(contactProto.systemFamilyName))
                     .withNickName(nullIfEmpty(contactProto.systemNickname))
-                    .withNickNameGivenName(nullIfEmpty(contactProto.givenName))
-                    .withNickNameFamilyName(nullIfEmpty(contactProto.familyName))
+                    .withNickNameGivenName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.given))
+                    .withNickNameFamilyName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.family))
                     .withNote(nullIfEmpty(contactProto.note))
                     .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp == 0
                             ? null